Tokenizer tweaks.