Converted the big grammar to use the parser