Modest improvements to group performance

Change-Id: I2eabd98403e510331c7f82430fa1495a3f2f4fe7