More logging macro work