Update based on the PR comments.