More refactoring as part of subgroup support.