(Issue #3692) eliminate extraneous markup in macro