Additional Set::contains() cleanup