Switched most hard comparisons to TokenFind