I probably wrote that before I had EquivalentHashMap/Set done. These are in now, so I can sort this out now.