Simplified the parser some.