Large cleanup (based on 'PullReview'). Let's see what he thinks now.