Change datatypes.Set semantics such that add/discard are truly inverses.