Can you keep the distinction between the REGISTER and NON-REGISTER cases in the LOG_DEBUG?