Minor tweaks from review.