Use OrderedSet so remove useless iteration for some singletone

No match.