parser: more macro-isation of strings