More fixes for not escaping macro content, gh-297