Correct some comments based on latest review.