Cleaned up in tokenizer and file_iter.