Comments from code review.