Added more debugging macros.