Updates based on feedback from https://github.com/opscode/chef/pull/2533