Address pull request feedback.