Some more progress with refactoring for subgroups.