Cleanup from merge of last pull request.