Minor tweaks from feedback.