Minor cleanup for pull request.