Index: kernel/generic/src/adt/cht.c
===================================================================
--- kernel/generic/src/adt/cht.c	(revision 3ac5086e0b5b6d93c26f2b1c150344366e5478e8)
+++ kernel/generic/src/adt/cht.c	(revision 7c4b26cbe3d53c6c9fa1c8f7bf78a840f7c05528)
@@ -298,4 +298,10 @@
 #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. */
@@ -1755,11 +1761,12 @@
 	
 	cht_link_t *next = get_next(*psrc_head);
-	marked_ptr_t ret;
-	
-	ret = cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
+
+	DBG(marked_ptr_t ret = )
+		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();
 	
-	ret = cas_link(psrc_head, next, N_CONST, next, N_INVALID);	
+	DBG(ret = ) 
+		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();
@@ -1853,5 +1860,5 @@
 	
 	/* Link the dest head to the second part of the split. */
-	marked_ptr_t ret = 
+	DBG(marked_ptr_t ret = )
 		cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
 	ASSERT(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret)));
@@ -2033,5 +2040,5 @@
 	} 
 	
-	marked_ptr_t ret = 
+	DBG(marked_ptr_t ret = )
 		cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
 	ASSERT(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret)));