Moved macros from squashing to macros