Cleaned up the parser internals a bit