Tidy up a bit.

(I’m going to stop messing about with this now!)