Implement suggestions in https://secure.phabricator.com/D9004