Made macros more safe.