More TokenFind replacements