diff --git a/scst/README_in-tree b/scst/README_in-tree
index 5460b040c..8096ed013 100644
--- a/scst/README_in-tree
+++ b/scst/README_in-tree
@@ -1078,15 +1078,6 @@ In order to get the maximum performance you should:
 
  - Disable in Makefile CONFIG_SCST_TRACING and CONFIG_SCST_DEBUG.
 
-
-IMPORTANT: Some of the above compilation options in the SCST SVN enabled
-=========  by default, i.e. the development version of SCST is optimized
-	   for development and bug hunting, not for performance. For it
-	   you can set the above options, except
-	   CONFIG_SCST_ALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ, in the
-	   needed values by command "make debug2perf" performed in
-	   trunk/.
-
 4. Make sure you have io_grouping_type option set correctly, especially
 in the following cases:
 
diff --git a/usr/fileio/debug.h b/usr/fileio/debug.h
index 605569887..3e4ea196d 100644
--- a/usr/fileio/debug.h
+++ b/usr/fileio/debug.h
@@ -101,8 +101,8 @@ do {								\
 
 #else  /* DEBUG || TRACING */
 
-#define TRACE(trace, args...) {}
-#define PRINT_BUFFER(message, buff, len) {}
+#define TRACE(trace, args...) do {} while (0)
+#define PRINT_BUFFER(message, buff, len) do {} while (0)
 
 static inline int debug_init(void) { return 0; }
 static inline void debug_done(void) {}
@@ -257,16 +257,16 @@ do {								\
 #define	NDEBUG
 #include <assert.h>
 
-#define TRACE_MEM(format, args...) {}
-#define TRACE_DBG(format, args...) {}
-#define TRACE_DBG_SPECIAL(args...) {}
-#define TRACE_MGMT_DBG(format, args...) {}
-#define TRACE_BUFFER(message, buff, len) {}
-#define TRACE_BUFF_FLAG(flag, message, buff, len) {}
-#define TRACE_ENTRY() {}
-#define TRACE_EXIT() {}
-#define TRACE_EXIT_RES(res) {}
-#define TRACE_EXIT_HRES(res) {}
+#define TRACE_MEM(format, args...) do {} while (0)
+#define TRACE_DBG(format, args...) do {} while (0)
+#define TRACE_DBG_SPECIAL(args...) do {} while (0)
+#define TRACE_MGMT_DBG(format, args...) do {} while (0)
+#define TRACE_BUFFER(message, buff, len) do {} while (0)
+#define TRACE_BUFF_FLAG(flag, message, buff, len) do {} while (0)
+#define TRACE_ENTRY() do {} while (0)
+#define TRACE_EXIT() do {} while (0)
+#define TRACE_EXIT_RES(res) do {} while (0)
+#define TRACE_EXIT_HRES(res) do {} while (0)
 
 #ifdef LOG_PREFIX