Leaving the BitSet alone for now; that's a different piece of code.  Doing that for HashSet and HashMap.