Updates based on pull request comments.