Fixed interaction between previous quoting fix and using imported macros in macros.