Updates based on feedback from pull request #367.