Minor cleanups for pull request #48.