More logging improvements/cleanup.