removed unused parameters from MacroParser