Fixed Parser so that it generates a correct AST