Address the pull request comments.