Fixing more Tokenizer bugs.