Simplifying nested macros