More tokenizer rule refactoring.