Logging cleanups.