Adds hasMacro method and changes back to macroCall