Tidyups from 168

These were described by @Leont as "low-hanging fruit" and if merged will reduce the size of #168 a bit.