Merge "Cleanup base/logging."