Rework some comments.