Implement suggestions / demands by @mpdehaan from https://github.com/ansible/ansible/pull/3599