diff --git a/js/loader/LoadContextBase.cpp b/js/loader/LoadContextBase.cpp
index b047e0b5863c..980da9b51077 100644
--- a/js/loader/LoadContextBase.cpp
+++ b/js/loader/LoadContextBase.cpp
@@ -17,23 +17,15 @@ namespace JS::loader {
 ////////////////////////////////////////////////////////////////
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(LoadContextBase)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(LoadContextBase)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(LoadContextBase)
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(LoadContextBase)
+NS_IMPL_CYCLE_COLLECTION(LoadContextBase, mRequest)
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(LoadContextBase)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mRequest)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(LoadContextBase)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRequest)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-LoadContextBase::LoadContextBase(ContextKind kind)
-    : mKind(kind), mRequest(nullptr) {}
+LoadContextBase::LoadContextBase(ContextKind kind) : mKind(kind) {}
 
 void LoadContextBase::SetRequest(ScriptLoadRequest* aRequest) {
   MOZ_ASSERT(!mRequest);
diff --git a/js/loader/ScriptLoadRequest.cpp b/js/loader/ScriptLoadRequest.cpp
index d5fd9ecbac58..ef6c7b80ff57 100644
--- a/js/loader/ScriptLoadRequest.cpp
+++ b/js/loader/ScriptLoadRequest.cpp
@@ -50,6 +50,7 @@ ScriptFetchOptions::~ScriptFetchOptions() = default;
 //////////////////////////////////////////////////////////////
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScriptLoadRequest)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(ScriptLoadRequest)