Address all comments on pull request.