Check in results of latest editing pass.
Tidy up a little.