Simplify the parser a little.