Fix reviewer comments.