Pulling out parsing of macro calls.
most merlin tests passing