Updates requested by code review.