Tokenizer fixes.