More logging cleanup.