Address pull request comments.