Made macros even less explosive