fixup DIAG_{ON,OFF} to get rid of compiler errors