Small internal group refactoring.