Simplify a bit of the parser