Yet another editing round.  Need to do another whitespace round after this and then it'll be done, for real this time.

If only because I'm fed up with it now.