Enforce invariant: mapGroup iterators all nonempty

Previously not all fixes in mapGroup were covered