Further tweaks based on comments.