s/[%-? MACRO/[%~ MACRO/g in common-macros, i.e., kill some more generated newlines