Fix code review feedback.