More logging rationalization work.