More improvements based on 'PullReview'.