Reformatted the parser grammar to make it easier to read (and more fragile)