And yet more logging changes

This really is the last one tonight - I've been told to put my laptop
down