A bit more progress on removing dependency on canManageTeam().