A bit more progress on getting rid of canManageTeam.