Working really hard on simplifying the lexer and parser.