Added macrosyntax changes to parser