I did some minor cleanup and committed this. I think there may be other changes that could be made, to take advantage of sorted values and so cut down on the overhead of managing groups with large numbers of members.