cdi: !CDI_DEBUG is a macro now