Updated handwritten lexer