Mostly just tidy up, catching pages that I missed the first time round.
A small number of pages were given a bit more reformat. A bit beyond
the remit of this merge request but not too much has been changed.