Index: ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
===================================================================
--- ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
+++ ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
@@ -517,7 +517,7 @@
 	// Please ensure to adapt the Tracer enabling and disabling in accordance with the GC things traced!
 
 	for (std::pair<const CStr, JS::Heap<JSObject*>>& handler : m_ScriptHandlers)
-		JS_CallObjectTracer(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
+		JS::TraceEdge(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
 }
 
 // Instantiate templated functions:
Index: ps/trunk/source/lobby/XmppClient.cpp
===================================================================
--- ps/trunk/source/lobby/XmppClient.cpp
+++ ps/trunk/source/lobby/XmppClient.cpp
@@ -198,10 +198,10 @@
 void XmppClient::TraceMember(JSTracer* trc)
 {
 	for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
-		JS_CallValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
+		JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
 
 	for (JS::Heap<JS::Value>& guiMessage : m_HistoricGuiMessages)
-		JS_CallValueTracer(trc, &guiMessage, "m_HistoricGuiMessages");
+		JS::TraceEdge(trc, &guiMessage, "m_HistoricGuiMessages");
 }
 
 /// Network
Index: ps/trunk/source/network/NetClient.cpp
===================================================================
--- ps/trunk/source/network/NetClient.cpp
+++ ps/trunk/source/network/NetClient.cpp
@@ -150,7 +150,7 @@
 void CNetClient::TraceMember(JSTracer *trc)
 {
 	for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
-		JS_CallValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
+		JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
 }
 
 void CNetClient::SetUserName(const CStrW& username)
Index: ps/trunk/source/simulation2/components/CCmpAIManager.cpp
===================================================================
--- ps/trunk/source/simulation2/components/CCmpAIManager.cpp
+++ ps/trunk/source/simulation2/components/CCmpAIManager.cpp
@@ -826,7 +826,7 @@
 	void TraceMember(JSTracer *trc)
 	{
 		for (std::pair<const VfsPath, JS::Heap<JS::Value>>& metadata : m_PlayerMetadata)
-			JS_CallValueTracer(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
+			JS::TraceEdge(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
 	}
 
 	void LoadMetadata(const VfsPath& path, JS::MutableHandleValue out)
Index: ps/trunk/source/simulation2/serialization/StdDeserializer.cpp
===================================================================
--- ps/trunk/source/simulation2/serialization/StdDeserializer.cpp
+++ ps/trunk/source/simulation2/serialization/StdDeserializer.cpp
@@ -45,8 +45,8 @@
 
 void CStdDeserializer::TraceMember(JSTracer *trc)
 {
-	for (size_t i=0; i<m_ScriptBackrefs.size(); ++i)
-		JS_CallObjectTracer(trc, &m_ScriptBackrefs[i], "StdDeserializer::m_ScriptBackrefs");
+	for (JS::Heap<JSObject*>& backref : m_ScriptBackrefs)
+		JS::TraceEdge(trc, &backref, "StdDeserializer::m_ScriptBackrefs");
 }
 
 void CStdDeserializer::Get(const char* name, u8* data, size_t len)