Fix some more of Peter's comments.