Touchups from code review.