Enforce invariant: mapGroup iterators all nonempty

Previously not all fixes in mapGroup were covered
Merge pull request #1072 from aposwolsky/develop

Enforce invariant: mapGroup iterators all nonempty