Cleaned up logging even more.