Move the Tokenizer.step method into Tokenizer.tokenize