Clean up parser a little more.