Various tweaks thanks to careful reading.