More logging work.