Bug 7503 - unexpanded macros

Summary: unexpanded macros