Address formatting issues from pull request 385.