One more optimization per code review.