Finished conversion to new lexer