Work on the parser, begin refactoring of the lexer.