Index: kernel/generic/src/adt/cht.c
===================================================================
--- kernel/generic/src/adt/cht.c	(revision eb748a07badfc0c0a45c245ac989bd41eb3ca16a)
+++ kernel/generic/src/adt/cht.c	(revision bf2042f951fffa4cddb191c3c45beab2ee41f65b)
@@ -296,11 +296,4 @@
 #include <atomic.h>
 #include <synch/rcu.h>
-
-#ifdef CONFIG_DEBUG
-/* Do not enclose in parentheses. */
-#define DBG(x) x
-#else
-#define DBG(x)
-#endif
 
 /* Logarithm of the min bucket count. Must be at least 3. 2^6 == 64 buckets. */
@@ -1761,11 +1754,15 @@
 	cht_link_t *next = get_next(*psrc_head);
 
-	DBG(marked_ptr_t ret = )
-		cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
+#ifdef CONFIG_DEBUG
+	marked_ptr_t ret =
+#endif
+	    cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
 	assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret)));
 	cas_order_barrier();
 
-	DBG(ret = )
-		cas_link(psrc_head, next, N_CONST, next, N_INVALID);
+#ifdef CONFIG_DEBUG
+	ret =
+#endif
+	    cas_link(psrc_head, next, N_CONST, next, N_INVALID);
 	assert(ret == make_link(next, N_CONST) || (N_INVALID == get_mark(ret)));
 	cas_order_barrier();
@@ -1859,6 +1856,8 @@
 
 	/* Link the dest head to the second part of the split. */
-	DBG(marked_ptr_t ret = )
-		cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
+#ifdef CONFIG_DEBUG
+	marked_ptr_t ret =
+#endif
+	    cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
 	assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret)));
 	cas_order_barrier();
@@ -2040,6 +2039,8 @@
 	}
 
-	DBG(marked_ptr_t ret = )
-		cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
+#ifdef CONFIG_DEBUG
+	marked_ptr_t ret =
+	    cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
+#endif
 	assert(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret)));
 	cas_order_barrier();