More cleanup based on 'PullReview'.