Address comments in pull request.