Revert "Reference macros without defining a function"