Fixed: Parsing of macros so MacroDefinition is no longer used.