--- a/dom/telephony/CallEvent.cpp
+++ b/dom/telephony/CallEvent.cpp
@@ -21,31 +21,19 @@ CallEvent::Create(TelephonyCall* aCall)
 
   nsRefPtr<CallEvent> event = new CallEvent();
 
   event->mCall = aCall;
 
   return event.forget();
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(CallEvent)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CallEvent,
-                                                  nsDOMEvent)
-  // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(tmp->mCall->ToISupports(),
-  //                                              TelephonyCall, "mCall")
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mCall");
-  cb.NoteNativeChild(tmp->mCall->ToISupports(), NS_CYCLE_COLLECTION_PARTICIPANT(TelephonyCall));
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CallEvent,
-                                                nsDOMEvent)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCall)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_INHERITED_1(CallEvent,
+                                     nsDOMEvent,
+                                     mCall)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CallEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCallEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CallEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
 
 NS_IMPL_ADDREF_INHERITED(CallEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(CallEvent, nsDOMEvent)

--- a/dom/telephony/TelephonyCall.cpp
+++ b/dom/telephony/TelephonyCall.cpp
@@ -135,30 +135,19 @@ TelephonyCall::NotifyError(const nsAStri
   NS_ASSERTION(event, "This should never fail!");
 
   if (NS_FAILED(event->Dispatch(ToIDOMEventTarget(),
                                 NS_LITERAL_STRING("error")))) {
     NS_WARNING("Failed to dispatch error event!");
   }
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(TelephonyCall)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TelephonyCall,
-                                                  nsDOMEventTargetHelper)
-  // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(tmp->mTelephony->ToISupports(),
-  //                                              Telephony, "mTelephony")
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mTelephony");
-  cb.NoteNativeChild(tmp->mTelephony->ToISupports(), NS_CYCLE_COLLECTION_PARTICIPANT(Telephony));
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(TelephonyCall,
-                                                nsDOMEventTargetHelper)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mTelephony)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_INHERITED_1(TelephonyCall,
+                                     nsDOMEventTargetHelper,
+                                     mTelephony)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TelephonyCall)
   NS_INTERFACE_MAP_ENTRY(nsIDOMTelephonyCall)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TelephonyCall)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
 NS_IMPL_ADDREF_INHERITED(TelephonyCall, nsDOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(TelephonyCall, nsDOMEventTargetHelper)