DRY up CHEF-3694 warnings and more