Clean up the tokenizer a bit