Now with OrderedSet speed enhancements as well!