Make OrderedSet pickable
(so fix tests broken by the previous commit that use them more frequently)