Small refactoring of GroupList logic.