Clean up logging a little bit more.