Enforce invariant: mapGroup iterators all nonempty

Previously not all fixes in mapGroup were covered
let's move this comment to addEmptyGuard to be sure we remember why we have it.