Clean up the parser a little