Refactoring to get rid of another CHEF-3694 warning