diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index bc89fc6a4..d18a709c9 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -130,7 +130,7 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 
 #ifdef YOSYS_XTRACE_GET_PUT
 	if (yosys_xtrace)
-		log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, refcount(idx));
+		log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, refcount(idx));
 #endif
 	return idx;
 }
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 4ae284b25..584c4e11b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -135,10 +135,6 @@ struct RTLIL::IdString
 		std::string_view str_view() const { return {buf, static_cast<size_t>(size)}; }
 	};
 
-	#undef YOSYS_XTRACE_GET_PUT
-	#undef YOSYS_SORT_ID_FREE_LIST
-	#undef YOSYS_NO_IDS_REFCNT
-
 	// the global id string cache
 
 	static bool destruct_guard_ok; // POD, will be initialized to zero
@@ -178,7 +174,7 @@ struct RTLIL::IdString
 			if (global_id_storage_.at(idx).buf == nullptr)
 				log("#X# DB-DUMP index %d: FREE\n", idx);
 			else
-				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, refcount(idx).buf, refcount);
+				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx).buf, refcount(idx));
 		}
 	#endif
 	}