-#define returnItem(code) TRACE_RETURN(code,item)
-#define returnItemPtr(code) TRACE_RETURN(code,item_ptr)
-#define returnItemOpts(code) TRACE_RETURN(code,item_opts)
-#define returnMenu(code) TRACE_RETURN(code,menu)
-#define returnMenuHook(code) TRACE_RETURN(code,menu_hook)
-#define returnMenuOpts(code) TRACE_RETURN(code,menu_opts)
+#define returnItem(code) TRACE_RETURN1(code,item)
+#define returnItemPtr(code) TRACE_RETURN1(code,item_ptr)
+#define returnItemOpts(code) TRACE_RETURN1(code,item_opts)
+#define returnMenu(code) TRACE_RETURN1(code,menu)
+#define returnMenuHook(code) TRACE_RETURN1(code,menu_hook)
+#define returnMenuOpts(code) TRACE_RETURN1(code,menu_opts)