Micro-optimizations to the groups feature