Merge "Use arraysize() for supplementary groups."