Tweaking for Chef 11, etc.