Changes per code review.