Clean up parser a little bit.