CHEF-3920: tighten wording to be more DRY.