Added preliminary support for passing arguments to macros