Small tweaks from feedback on bug 930298.