Cleaning up logging some more.