Names of standard macros are no longer shadowed.
Moved macro definitions to separate file and added more definitions.