Clean up logging a bit more.