Minor tweaks from code review.