More progress with db maintenance code to support subgroups.