Changed some CL_DEBUG macros to use a more safe version