Hi Tom,

I have a patch that should fix your problems with some characters in
macro expansions: