More lexer and parser improvements.