More lexer and parser work.