added MacroArgParser
integrated MacroArgParser. Simpler signature for macros