More cleanup from pull request 13.