More cleanup based on 'Pullreview'.