diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index ee22e0bd0d3..ed9881273de 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -133,23 +133,13 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager)
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsFocusManager)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFocusManager)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mActiveWindow)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedWindow)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedContent)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstBlurEvent)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstFocusEvent)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindowBeingLowered)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFocusManager)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mActiveWindow)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFocusedWindow)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFocusedContent)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFirstBlurEvent)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFirstFocusEvent)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindowBeingLowered)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+NS_IMPL_CYCLE_COLLECTION_6(nsFocusManager,
+                           mActiveWindow,
+                           mFocusedWindow,
+                           mFocusedContent,
+                           mFirstBlurEvent,
+                           mFirstFocusEvent,
+                           mWindowBeingLowered)
 
 nsFocusManager* nsFocusManager::sInstance = nullptr;
 bool nsFocusManager::sMouseFocusesFormControl = false;
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index 88921fa42f7..c9b16ea7103 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -90,15 +90,7 @@ nsScreen::~nsScreen()
 
 DOMCI_DATA(Screen, nsScreen)
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsScreen)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsScreen,
-                                                  nsDOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsScreen,
-                                                nsDOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_INHERITED_0(nsScreen, nsDOMEventTargetHelper)
 
 // QueryInterface implementation for nsScreen
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen)
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 2a9cc597442..e508436ad5d 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -39,19 +39,10 @@ nsWindowRoot::~nsWindowRoot()
   }
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsWindowRoot)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsWindowRoot)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListenerManager)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPopupNode)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParent)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsWindowRoot)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mListenerManager)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPopupNode)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+NS_IMPL_CYCLE_COLLECTION_3(nsWindowRoot,
+                           mListenerManager,
+                           mPopupNode,
+                           mParent)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget)