Fine tune simpleClone & fix Set#contains