Tokenizer: Removed commented-out simplification