Upgraded tokenizer.