Macros are now safe. And some other stuff.
Revert "Macros are now safe. And some other stuff."

This reverts commit 61418c7c11c460afa26827f6f4bbd181db27a6f0.
Revert "Revert "Macros are now safe. And some other stuff.""

This reverts commit 382f419986d0a557702b13b78710c3b27a170265.