Addressable spring clean

This tidies up a couple of (very?) minor things that came in with #174, that have caught my eye recently.

@RST-J I'd love to get your feedback on this, especially