MacroContext for macro methods

MacroTransformation code improvements