Changes proposed by the code review.