Transformed grammar so it can be parsed by Grammophone
Merge commit '5a9035adc17f50a867935f672afaeeaeedbe5066' into parser_implementation