One more round of code review.