More unfudging now that set/bag intersection works