Fixup from feedback from pull request.