(Un)Fudges for the latest Set/Bag code