diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 19aa39e549f..8baad580628 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -1281,14 +1281,10 @@ nsHTMLDocument::ContentAppended(nsIContent* aContainer,
                                 PRInt32 aNewIndexInContainer)
 {
   if (nsnull != mNamedItems) {
-    nsIContent* child;
-    nsIAtom *name;
+    nsCOMPtr<nsIAtom> name;
 
-    aContainer->GetTag(name);
-    aContainer->ChildAt(aNewIndexInContainer, child);
-    RegisterNamedItems(aContainer, name == nsHTMLAtoms::form);
-    NS_IF_RELEASE(child);
-    NS_IF_RELEASE(name);
+    aContainer->GetTag(*getter_AddRefs(name));
+    RegisterNamedItems(aContainer, name.get() == nsHTMLAtoms::form);
   }
 
   return nsDocument::ContentAppended(aContainer, aNewIndexInContainer);
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index 19aa39e549f..8baad580628 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -1281,14 +1281,10 @@ nsHTMLDocument::ContentAppended(nsIContent* aContainer,
                                 PRInt32 aNewIndexInContainer)
 {
   if (nsnull != mNamedItems) {
-    nsIContent* child;
-    nsIAtom *name;
+    nsCOMPtr<nsIAtom> name;
 
-    aContainer->GetTag(name);
-    aContainer->ChildAt(aNewIndexInContainer, child);
-    RegisterNamedItems(aContainer, name == nsHTMLAtoms::form);
-    NS_IF_RELEASE(child);
-    NS_IF_RELEASE(name);
+    aContainer->GetTag(*getter_AddRefs(name));
+    RegisterNamedItems(aContainer, name.get() == nsHTMLAtoms::form);
   }
 
   return nsDocument::ContentAppended(aContainer, aNewIndexInContainer);