Convert some OrderedSet when we only check if element are in the set or don't care about the iteration order. Only local changes.