CuckooSet/Map refactoring