Some logging cleanups.