Changes based on pull request comments.