Update the grammar-kit parser to provide more structure.