A bit more refactoring for subgroups.