More code review feedback.