Minor cleanup on lexer. More work on the parser and AST