Fix up some comments per code review.