Cleaned up the parser code a little bit.