Macro paradise in prep for 2.11 macros