Correcting some code review feedback.