Tidy ups

Miscellaneous petty things, unrelated to my immediate work, that I noticed during the nova/cf-hub/ main loop reworking.