Improve support for Chef 11.