More changes based on 'PullReview'.