Follow-up to #12089: Cleanup: unescaped &