Refactor code.
Update ParserTests.