Internal lexer refactor, removing EndOfInputException