Logger infrastructure tidyup, imports. Somebody should go over and change all the old-style logger registrations.