Some more code review feedback.