Catch up to dynamically-sized cr_groups in FBSD80