First set of unfudges/new fudges for Set/Bag related changes