Some more refactoring of reports for subgroups.