Changes, need to flesh out the base class of OrderedHashSet which
doesn't exist in C++.