Added macro functionality to top-level parser, and tests.