Tokenizer: Removed simplifyComparisonOrder