Address questions from code review.