Make Bag.WHICH on demand and remove old cruft