One more cleanup from the code review.