Fixed to use the new lexer.