Sure thing. I'll put both the original grammar and the refactored grammar, so that it is clear what methods exactly correspond to what in the original grammar.