Logging cleanup, mostly for INFO output.