Fixed up and regenerated the parser