diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -692,8 +692,11 @@
   {
     nsNodeInfoManager *niMgr = aNodeInfo->NodeInfoManager();
 
-    return niMgr->GetNodeInfo(aName, aNodeInfo->GetPrefixAtom(),
-                              aNodeInfo->NamespaceID(), aResult);
+    {
+      *aResult = (nsINodeInfo *) niMgr->GetNodeInfo(aName, aNodeInfo->GetPrefixAtom(),
+                              aNodeInfo->NamespaceID());
+      return *aResult ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
   }
 
   /**
@@ -705,8 +708,11 @@
   {
     nsNodeInfoManager *niMgr = aNodeInfo->NodeInfoManager();
 
-    return niMgr->GetNodeInfo(aNodeInfo->NameAtom(), aPrefix,
-                              aNodeInfo->NamespaceID(), aResult);
+    {
+      *aResult = (nsINodeInfo *) niMgr->GetNodeInfo(aNodeInfo->NameAtom(), aPrefix,
+                              aNodeInfo->NamespaceID());
+      return *aResult ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
   }
 
   /**
diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -142,9 +142,9 @@
   }
 
   nsCOMPtr<nsINodeInfo> newNodeInfo;
-  nsresult rv = aDocument->NodeInfoManager()->
+  nsresult rv = ((newNodeInfo = aDocument->NodeInfoManager()->
     GetNodeInfo(mNodeInfo->NameAtom(), mNodeInfo->GetPrefixAtom(),
-                mNodeInfo->NamespaceID(), getter_AddRefs(newNodeInfo));
+                mNodeInfo->NamespaceID())) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ASSERTION(newNodeInfo, "GetNodeInfo lies");
   mNodeInfo.swap(newNodeInfo);
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -384,9 +384,8 @@
     // Don't use the nodeinfo even if one exists since it can
     // have the wrong owner document.
     nsCOMPtr<nsINodeInfo> ni;
-    mContent->NodeInfo()->NodeInfoManager()->
-      GetNodeInfo(name->LocalName(), name->GetPrefix(), name->NamespaceID(),
-                  getter_AddRefs(ni));
+    ni = mContent->NodeInfo()->NodeInfoManager()->
+      GetNodeInfo(name->LocalName(), name->GetPrefix(), name->NamespaceID());
     NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
     return GetAttribute(ni, aReturn);
@@ -454,9 +453,8 @@
     if (nameSpaceID == attrNS &&
         nameAtom->EqualsUTF8(utf8Name)) {
       nsCOMPtr<nsINodeInfo> ni;
-      mContent->NodeInfo()->NodeInfoManager()->
-        GetNodeInfo(nameAtom, name->GetPrefix(), nameSpaceID,
-                    getter_AddRefs(ni));
+      ni = mContent->NodeInfo()->NodeInfoManager()->
+        GetNodeInfo(nameAtom, name->GetPrefix(), nameSpaceID);
       NS_ENSURE_TRUE(ni, NS_ERROR_FAILURE);
 
       return GetAttribute(ni, aReturn, aRemove);
diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp
--- a/content/base/src/nsDOMDocumentType.cpp
+++ b/content/base/src/nsDOMDocumentType.cpp
@@ -85,8 +85,11 @@
   }
 
   nsCOMPtr<nsINodeInfo> ni;
-  rv = nimgr->GetNodeInfo(nsGkAtoms::documentTypeNodeName, nsnull,
-                          kNameSpaceID_None, getter_AddRefs(ni));
+  {
+    ni = nimgr->GetNodeInfo(nsGkAtoms::documentTypeNodeName, nsnull,
+                          kNameSpaceID_None);
+    rv = ni ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   *aDocType = new nsDOMDocumentType(ni, aName, aEntities, aNotations,
@@ -257,10 +260,9 @@
                                aParent->NodeInfo()->NodeInfoManager() :
                                aDocument->NodeInfoManager();
     nsCOMPtr<nsINodeInfo> newNodeInfo;
-    nsresult rv = nimgr->GetNodeInfo(mNodeInfo->NameAtom(),
+    nsresult rv = ((newNodeInfo = nimgr->GetNodeInfo(mNodeInfo->NameAtom(),
                                      mNodeInfo->GetPrefixAtom(),
-                                     mNodeInfo->NamespaceID(),
-                                     getter_AddRefs(newNodeInfo));
+                                     mNodeInfo->NamespaceID())) ? NS_OK : NS_ERROR_NO_INTERFACE);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mNodeInfo.swap(newNodeInfo);
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -5948,8 +5948,10 @@
                                                aNamespaceID;
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(aName, aPrefix, aNamespaceID,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(aName, aPrefix, aNamespaceID);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_NewElement(aResult, elementType, nodeInfo, PR_FALSE);
diff --git a/content/base/src/nsDocumentFragment.cpp b/content/base/src/nsDocumentFragment.cpp
--- a/content/base/src/nsDocumentFragment.cpp
+++ b/content/base/src/nsDocumentFragment.cpp
@@ -166,9 +166,8 @@
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
   nsresult rv =
-    aNodeInfoManager->GetNodeInfo(nsGkAtoms::documentFragmentNodeName,
-                                  nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(nodeInfo));
+    ((nodeInfo = aNodeInfoManager->GetNodeInfo(nsGkAtoms::documentFragmentNodeName,
+                                  nsnull, kNameSpaceID_None)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsDocumentFragment *it = new nsDocumentFragment(nodeInfo);
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2472,8 +2472,8 @@
 
   nsINodeInfo* nodeInfo;
   if (name->IsAtom()) {
-    mNodeInfo->NodeInfoManager()->GetNodeInfo(name->Atom(), nsnull,
-                                              kNameSpaceID_None, &nodeInfo);
+    nodeInfo = (nsINodeInfo *) mNodeInfo->NodeInfoManager()->GetNodeInfo(name->Atom(), nsnull,
+                                              kNameSpaceID_None);
   }
   else {
     NS_ADDREF(nodeInfo = name->NodeInfo());
@@ -3790,9 +3790,11 @@
   }
   else {
     nsCOMPtr<nsINodeInfo> ni;
-    rv = mNodeInfo->NodeInfoManager()->GetNodeInfo(aName, aPrefix,
-                                                   aNamespaceID,
-                                                   getter_AddRefs(ni));
+    {
+      ni = mNodeInfo->NodeInfoManager()->GetNodeInfo(aName, aPrefix,
+                                                   aNamespaceID);
+      rv = ni ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = mAttrsAndChildren.SetAndTakeAttr(ni, aParsedValue);
diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp
--- a/content/base/src/nsNodeInfoManager.cpp
+++ b/content/base/src/nsNodeInfoManager.cpp
@@ -214,11 +214,12 @@
 }
 
 
-nsresult
+nsINodeInfo*
 nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
-                               PRInt32 aNamespaceID, nsINodeInfo** aNodeInfo)
+                               PRInt32 aNamespaceID)
 {
-  NS_ENSURE_ARG_POINTER(aName);
+  nsINodeInfo* __aNodeInfo = 0;
+  nsINodeInfo** aNodeInfo = &__aNodeInfo;;
   NS_ASSERTION(!aName->Equals(EmptyString()),
                "Don't pass an empty string to GetNodeInfo, fix caller.");
 
@@ -231,24 +232,24 @@
 
     NS_ADDREF(*aNodeInfo);
 
-    return NS_OK;
+    return __aNodeInfo;
   }
 
   nsNodeInfo *newNodeInfo = nsNodeInfo::Create();
-  NS_ENSURE_TRUE(newNodeInfo, NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(newNodeInfo, nsnull);
 
   NS_ADDREF(newNodeInfo);
 
   nsresult rv = newNodeInfo->Init(aName, aPrefix, aNamespaceID, this);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS(rv, nsnull);
 
   PLHashEntry *he;
   he = PL_HashTableAdd(mNodeInfoHash, &newNodeInfo->mInner, newNodeInfo);
-  NS_ENSURE_TRUE(he, NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(he, nsnull);
 
   *aNodeInfo = newNodeInfo;
 
-  return NS_OK;
+  return __aNodeInfo;
 }
 
 
@@ -257,8 +258,10 @@
                                PRInt32 aNamespaceID, nsINodeInfo** aNodeInfo)
 {
   nsCOMPtr<nsIAtom> name = do_GetAtom(aName);
-  return nsNodeInfoManager::GetNodeInfo(name, aPrefix, aNamespaceID,
-                                        aNodeInfo);
+  {
+    *aNodeInfo = (nsINodeInfo *) nsNodeInfoManager::GetNodeInfo(name, aPrefix, aNamespaceID);
+    return *aNodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
 }
 
 
@@ -301,15 +304,17 @@
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  return GetNodeInfo(nameAtom, prefixAtom, nsid, aNodeInfo);
+  {
+    *aNodeInfo = (nsINodeInfo *) GetNodeInfo(nameAtom, prefixAtom, nsid);
+    return *aNodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
 }
 
 already_AddRefed<nsINodeInfo>
 nsNodeInfoManager::GetTextNodeInfo()
 {
   if (!mTextNodeInfo) {
-    GetNodeInfo(nsGkAtoms::textTagName, nsnull, kNameSpaceID_None,
-                &mTextNodeInfo);
+    mTextNodeInfo = (nsINodeInfo *) GetNodeInfo(nsGkAtoms::textTagName, nsnull, kNameSpaceID_None);
   }
   else {
     NS_ADDREF(mTextNodeInfo);
@@ -322,8 +327,7 @@
 nsNodeInfoManager::GetCommentNodeInfo()
 {
   if (!mCommentNodeInfo) {
-    GetNodeInfo(nsGkAtoms::commentTagName, nsnull, kNameSpaceID_None,
-                &mCommentNodeInfo);
+    mCommentNodeInfo = (nsINodeInfo *) GetNodeInfo(nsGkAtoms::commentTagName, nsnull, kNameSpaceID_None);
   }
   else {
     NS_ADDREF(mCommentNodeInfo);
@@ -336,8 +340,7 @@
 nsNodeInfoManager::GetDocumentNodeInfo()
 {
   if (!mDocumentNodeInfo) {
-    GetNodeInfo(nsGkAtoms::documentNodeName, nsnull, kNameSpaceID_None,
-                &mDocumentNodeInfo);
+    mDocumentNodeInfo = (nsINodeInfo *) GetNodeInfo(nsGkAtoms::documentNodeName, nsnull, kNameSpaceID_None);
   }
   else {
     NS_ADDREF(mDocumentNodeInfo);
diff --git a/content/base/src/nsNodeInfoManager.h b/content/base/src/nsNodeInfoManager.h
--- a/content/base/src/nsNodeInfoManager.h
+++ b/content/base/src/nsNodeInfoManager.h
@@ -85,8 +85,8 @@
   /**
    * Methods for creating nodeinfo's from atoms and/or strings.
    */
-  nsresult GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
-                       PRInt32 aNamespaceID, nsINodeInfo** aNodeInfo);
+  nsINodeInfo* GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
+                       PRInt32 aNamespaceID);
   nsresult GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
                        PRInt32 aNamespaceID, nsINodeInfo** aNodeInfo);
   nsresult GetNodeInfo(const nsAString& aQualifiedName,
diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -515,10 +515,12 @@
   nsINodeInfo *nodeInfo = aNode->mNodeInfo;
   nsCOMPtr<nsINodeInfo> newNodeInfo;
   if (nodeInfoManager) {
-    rv = nodeInfoManager->GetNodeInfo(nodeInfo->NameAtom(),
+    {
+      newNodeInfo = nodeInfoManager->GetNodeInfo(nodeInfo->NameAtom(),
                                       nodeInfo->GetPrefixAtom(),
-                                      nodeInfo->NamespaceID(),
-                                      getter_AddRefs(newNodeInfo));
+                                      nodeInfo->NamespaceID());
+      rv = newNodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
 
     nodeInfo = newNodeInfo;
diff --git a/content/html/content/src/nsHTMLImageElement.cpp b/content/html/content/src/nsHTMLImageElement.cpp
--- a/content/html/content/src/nsHTMLImageElement.cpp
+++ b/content/html/content/src/nsHTMLImageElement.cpp
@@ -166,9 +166,11 @@
       do_QueryInterface(nsContentUtils::GetDocumentFromCaller());
     NS_ENSURE_TRUE(doc, nsnull);
 
-    rv = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nsnull,
-                                             kNameSpaceID_None,
-                                             getter_AddRefs(nodeInfo));
+    {
+      nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nsnull,
+                                             kNameSpaceID_None);
+      rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, nsnull);
   }
 
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -152,9 +152,11 @@
       do_QueryInterface(nsContentUtils::GetDocumentFromCaller());
     NS_ENSURE_TRUE(doc, nsnull);
 
-    rv = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::option, nsnull,
-                                             kNameSpaceID_None,
-                                             getter_AddRefs(nodeInfo));
+    {
+      nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::option, nsnull,
+                                             kNameSpaceID_None);
+      rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, nsnull);
   }
 
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -542,8 +542,7 @@
     ToLowerCase(tmp);
 
     nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
-    mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(nodeInfo));
+    nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None);
   }
   else if (mNodeInfoCache[aNodeType]) {
     nodeInfo = mNodeInfoCache[aNodeType];
@@ -556,8 +555,7 @@
     nsIAtom *name = parserService->HTMLIdToAtomTag(aNodeType);
     NS_ASSERTION(name, "What? Reverse mapping of id to string broken!!!");
 
-    mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(nodeInfo));
+    nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None);
     NS_IF_ADDREF(mNodeInfoCache[aNodeType] = nodeInfo);
   }
 
@@ -1708,9 +1706,11 @@
   mMaxTextRun = nsContentUtils::GetIntPref("content.maxtextrun", 8191);
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::html, nsnull,
-                                     kNameSpaceID_None,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::html, nsnull,
+                                     kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Make root part
@@ -1737,9 +1737,11 @@
   }
 
   // Make head part
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::head,
-                                     nsnull, kNameSpaceID_None,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::head,
+                                     nsnull, kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   mHead = NS_NewHTMLHeadElement(nodeInfo);
@@ -2936,8 +2938,7 @@
     // Create content object
     nsCOMPtr<nsIContent> element;
     nsCOMPtr<nsINodeInfo> nodeInfo;
-    mNodeInfoManager->GetNodeInfo(nsGkAtoms::link, nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(nodeInfo));
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::link, nsnull, kNameSpaceID_None);
 
     result = NS_NewHTMLElement(getter_AddRefs(element), nodeInfo, PR_FALSE);
     NS_ENSURE_SUCCESS(result, result);
diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp
--- a/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -420,8 +420,10 @@
       ToLowerCase(tmp);
 
       nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
-      result = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None,
-                                             getter_AddRefs(nodeInfo));
+      {
+        nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None);
+        result = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+      }
       NS_ENSURE_SUCCESS(result, result);
     }
     else if (mNodeInfoCache[nodeType]) {
@@ -435,8 +437,10 @@
       nsIAtom *name = parserService->HTMLIdToAtomTag(nodeType);
       NS_ASSERTION(name, "This should not happen!");
 
-      result = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None,
-                                             getter_AddRefs(nodeInfo));
+      {
+        nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None);
+        result = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+      }
       NS_ENSURE_SUCCESS(result, result);
 
       NS_ADDREF(mNodeInfoCache[nodeType] = nodeInfo);
@@ -523,9 +527,11 @@
           ToLowerCase(tmp);
 
           nsCOMPtr<nsIAtom> name = do_GetAtom(tmp);
-          result = mNodeInfoManager->GetNodeInfo(name, nsnull,
-                                                 kNameSpaceID_None,
-                                                 getter_AddRefs(nodeInfo));
+          {
+            nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull,
+                                                 kNameSpaceID_None);
+            result = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+          }
           NS_ENSURE_SUCCESS(result, result);
         }
         else if (mNodeInfoCache[nodeType]) {
@@ -535,9 +541,11 @@
           nsIAtom *name = parserService->HTMLIdToAtomTag(nodeType);
           NS_ASSERTION(name, "This should not happen!");
 
-          result = mNodeInfoManager->GetNodeInfo(name, nsnull,
-                                                 kNameSpaceID_None,
-                                                 getter_AddRefs(nodeInfo));
+          {
+            nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull,
+                                                 kNameSpaceID_None);
+            result = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+          }
           NS_ENSURE_SUCCESS(result, result);
           NS_ADDREF(mNodeInfoCache[nodeType] = nodeInfo);
         }
@@ -1194,9 +1202,11 @@
       nsIParserService* parserService = nsContentUtils::GetParserService();
       if (!parserService)
         return NS_ERROR_OUT_OF_MEMORY;
-      rv = mNodeInfoManager->GetNodeInfo(name, nsnull,
-                                         kNameSpaceID_None,
-                                         getter_AddRefs(nodeInfo));
+      {
+        nodeInfo = mNodeInfoManager->GetNodeInfo(name, nsnull,
+                                         kNameSpaceID_None);
+        rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+      }
       NS_ENSURE_SUCCESS(rv, rv);
       rv = NS_NewHTMLElement(getter_AddRefs(content), nodeInfo, PR_FALSE);
       NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp
--- a/content/html/document/src/nsImageDocument.cpp
+++ b/content/html/document/src/nsImageDocument.cpp
@@ -611,9 +611,11 @@
   }
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::img, nsnull,
-                                     kNameSpaceID_None,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::img, nsnull,
+                                     kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   mImageContent = NS_NewHTMLImageElement(nodeInfo);
diff --git a/content/html/document/src/nsMediaDocument.cpp b/content/html/document/src/nsMediaDocument.cpp
--- a/content/html/document/src/nsMediaDocument.cpp
+++ b/content/html/document/src/nsMediaDocument.cpp
@@ -233,9 +233,11 @@
   nsresult rv;
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::html, nsnull,
-                                     kNameSpaceID_None,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::html, nsnull,
+                                     kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsRefPtr<nsGenericHTMLElement> root = NS_NewHTMLHtmlElement(nodeInfo);
@@ -247,9 +249,11 @@
   rv = AppendChildTo(root, PR_FALSE);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::body, nsnull,
-                                     kNameSpaceID_None,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::body, nsnull,
+                                     kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsRefPtr<nsGenericHTMLElement> body = NS_NewHTMLBodyElement(nodeInfo);
diff --git a/content/html/document/src/nsPluginDocument.cpp b/content/html/document/src/nsPluginDocument.cpp
--- a/content/html/document/src/nsPluginDocument.cpp
+++ b/content/html/document/src/nsPluginDocument.cpp
@@ -241,9 +241,11 @@
 
   // make plugin content
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(nsGkAtoms::embed, nsnull,
-                                     kNameSpaceID_None,
-                                    getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::embed, nsnull,
+                                     kNameSpaceID_None);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
   rv = NS_NewHTMLElement(getter_AddRefs(mPluginContent), nodeInfo, PR_FALSE);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -1068,9 +1068,11 @@
   }
   else {
     nsCOMPtr<nsINodeInfo> ni;
-    rv = mNodeInfo->NodeInfoManager()->GetNodeInfo(aName, nsnull,
-                                                   aNamespaceID,
-                                                   getter_AddRefs(ni));
+    {
+      ni = mNodeInfo->NodeInfoManager()->GetNodeInfo(aName, nsnull,
+                                                   aNamespaceID);
+      rv = ni ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = mMappedAttributes.SetAndTakeAttr(ni, attrVal);
diff --git a/content/svg/content/src/nsSVGUseElement.cpp b/content/svg/content/src/nsSVGUseElement.cpp
--- a/content/svg/content/src/nsSVGUseElement.cpp
+++ b/content/svg/content/src/nsSVGUseElement.cpp
@@ -321,8 +321,7 @@
       return nsnull;
 
     nsCOMPtr<nsINodeInfo> nodeInfo;
-    nodeInfoManager->GetNodeInfo(nsGkAtoms::svg, nsnull, kNameSpaceID_SVG,
-                                 getter_AddRefs(nodeInfo));
+    nodeInfo = nodeInfoManager->GetNodeInfo(nsGkAtoms::svg, nsnull, kNameSpaceID_SVG);
     if (!nodeInfo)
       return nsnull;
 
diff --git a/content/xbl/src/nsXBLContentSink.cpp b/content/xbl/src/nsXBLContentSink.cpp
--- a/content/xbl/src/nsXBLContentSink.cpp
+++ b/content/xbl/src/nsXBLContentSink.cpp
@@ -946,8 +946,7 @@
     }
     else {
       nsCOMPtr<nsINodeInfo> ni;
-      mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                    getter_AddRefs(ni));
+      ni = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
       attrs[i].mName.SetTo(ni);
     }
     
diff --git a/content/xml/content/src/nsXMLCDATASection.cpp b/content/xml/content/src/nsXMLCDATASection.cpp
--- a/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/content/xml/content/src/nsXMLCDATASection.cpp
@@ -82,9 +82,8 @@
   *aInstancePtrResult = nsnull;
 
   nsCOMPtr<nsINodeInfo> ni;
-  nsresult rv = aNodeInfoManager->GetNodeInfo(nsGkAtoms::cdataTagName,
-                                              nsnull, kNameSpaceID_None,
-                                              getter_AddRefs(ni));
+  nsresult rv = ((ni = aNodeInfoManager->GetNodeInfo(nsGkAtoms::cdataTagName,
+                                              nsnull, kNameSpaceID_None)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsXMLCDATASection *instance = new nsXMLCDATASection(ni);
diff --git a/content/xml/content/src/nsXMLProcessingInstruction.cpp b/content/xml/content/src/nsXMLProcessingInstruction.cpp
--- a/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -59,9 +59,8 @@
 
   nsCOMPtr<nsINodeInfo> ni;
   nsresult rv =
-    aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
-                                  nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(ni));
+    ((ni = aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
+                                  nsnull, kNameSpaceID_None)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsXMLProcessingInstruction *instance =
diff --git a/content/xml/content/src/nsXMLStylesheetPI.cpp b/content/xml/content/src/nsXMLStylesheetPI.cpp
--- a/content/xml/content/src/nsXMLStylesheetPI.cpp
+++ b/content/xml/content/src/nsXMLStylesheetPI.cpp
@@ -260,9 +260,8 @@
   
   nsCOMPtr<nsINodeInfo> ni;
   nsresult rv =
-    aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
-                                  nsnull, kNameSpaceID_None,
-                                  getter_AddRefs(ni));
+    ((ni = aNodeInfoManager->GetNodeInfo(nsGkAtoms::processingInstructionTagName,
+                                  nsnull, kNameSpaceID_None)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsXMLStylesheetPI *instance = new nsXMLStylesheetPI(ni, aData);
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -1023,8 +1023,10 @@
   }
   
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  result = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                         getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
+    result = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(result, result);
 
   result = CreateElement(aAtts, aAttsCount, nodeInfo, aLineNumber,
diff --git a/content/xml/document/src/nsXMLFragmentContentSink.cpp b/content/xml/document/src/nsXMLFragmentContentSink.cpp
--- a/content/xml/document/src/nsXMLFragmentContentSink.cpp
+++ b/content/xml/document/src/nsXMLFragmentContentSink.cpp
@@ -621,8 +621,10 @@
   while (*aAtts) {
     nsContentUtils::SplitExpatName(aAtts[0], getter_AddRefs(prefix),
                                    getter_AddRefs(localName), &nameSpaceID);
-    rv = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                       getter_AddRefs(nodeInfo));
+    {
+      nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
+      rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
     // check the attributes we allow that contain URIs
     if (IsAttrURI(nodeInfo->NameAtom())) {
@@ -670,8 +672,10 @@
     return NS_OK;
   
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
   
   // bounce it if it's not on the whitelist or we're inside
@@ -692,8 +696,10 @@
   for (PRUint32 i = 0; i < aAttsCount; i += 2) {
     nsContentUtils::SplitExpatName(aAtts[i], getter_AddRefs(prefix),
                                    getter_AddRefs(localName), &nameSpaceID);
-    rv = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                       getter_AddRefs(nodeInfo));
+    {
+      nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
+      rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
     
     name = nodeInfo->NameAtom();
@@ -729,8 +735,10 @@
   }
   
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                     getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
   
   nsCOMPtr<nsIAtom> name = nodeInfo->NameAtom();
diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/content/xslt/src/xslt/txMozillaTextOutput.cpp
--- a/content/xslt/src/xslt/txMozillaTextOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaTextOutput.cpp
@@ -286,8 +286,8 @@
     *aResult = nsnull;
 
     nsCOMPtr<nsINodeInfo> ni;
-    nsresult rv = mDocument->NodeInfoManager()->
-        GetNodeInfo(aName, nsnull, kNameSpaceID_XHTML, getter_AddRefs(ni));
+    nsresult rv = ((ni = mDocument->NodeInfoManager()->
+        GetNodeInfo(aName, nsnull, kNameSpaceID_XHTML)) ? NS_OK : NS_ERROR_NO_INTERFACE);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return NS_NewHTMLElement(aResult, ni, PR_FALSE);
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -545,8 +545,10 @@
 
     // Create the element
     nsCOMPtr<nsINodeInfo> ni;
-    rv = mNodeInfoManager->GetNodeInfo(aLocalName, aPrefix, aNsID,
-                                       getter_AddRefs(ni));
+    {
+      ni = mNodeInfoManager->GetNodeInfo(aLocalName, aPrefix, aNsID);
+      rv = ni ? NS_OK : NS_ERROR_NO_INTERFACE;
+    }
     NS_ENSURE_SUCCESS(rv, rv);
 
     NS_NewElement(getter_AddRefs(mOpenedElement), aElemType, ni, PR_FALSE);
@@ -986,9 +988,8 @@
     *aResult = nsnull;
 
     nsCOMPtr<nsINodeInfo> ni;
-    nsresult rv = mNodeInfoManager->GetNodeInfo(aName, nsnull,
-                                                kNameSpaceID_None,
-                                                getter_AddRefs(ni));
+    nsresult rv = ((ni = mNodeInfoManager->GetNodeInfo(aName, nsnull,
+                                                kNameSpaceID_None)) ? NS_OK : NS_ERROR_NO_INTERFACE);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return NS_NewHTMLElement(aResult, ni, PR_FALSE);
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -526,7 +526,7 @@
   if (!nodeInfo) {
     nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(aStr);
     if (HandledByInner(nameAtom)) 
-      mNodeInfo->NodeInfoManager()->GetNodeInfo(nameAtom, nsnull, kNameSpaceID_None, &nodeInfo);
+      nodeInfo = (nsINodeInfo *) mNodeInfo->NodeInfoManager()->GetNodeInfo(nameAtom, nsnull, kNameSpaceID_None);
   }
   
   return nodeInfo;
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -334,10 +334,12 @@
     nsresult rv;
     if (aDocument) {
         nsINodeInfo* ni = aPrototype->mNodeInfo;
-        rv = aDocument->NodeInfoManager()->GetNodeInfo(ni->NameAtom(),
+        {
+          nodeInfo = aDocument->NodeInfoManager()->GetNodeInfo(ni->NameAtom(),
                                                        ni->GetPrefixAtom(),
-                                                       ni->NamespaceID(),
-                                                       getter_AddRefs(nodeInfo));
+                                                       ni->NamespaceID());
+          rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+        }
         NS_ENSURE_SUCCESS(rv, rv);
     }
     else {
@@ -2660,9 +2662,9 @@
     for (i = 0; i < mNumAttributes; ++i) {
         nsCOMPtr<nsINodeInfo> ni;
         if (mAttributes[i].mName.IsAtom()) {
-            mNodeInfo->NodeInfoManager()->
+            ni = mNodeInfo->NodeInfoManager()->
                 GetNodeInfo(mAttributes[i].mName.Atom(), nsnull,
-                            kNameSpaceID_None, getter_AddRefs(ni));
+                            kNameSpaceID_None);
             NS_ASSERTION(ni, "the nodeinfo should already exist");
         }
         else {
diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp
--- a/content/xul/document/src/nsXULContentSink.cpp
+++ b/content/xul/document/src/nsXULContentSink.cpp
@@ -478,9 +478,8 @@
     }
 
     nsCOMPtr<nsINodeInfo> ni;
-    nsresult rv = mNodeInfoManager->GetNodeInfo(localName, prefix,
-                                                nameSpaceID,
-                                                getter_AddRefs(ni));
+    nsresult rv = ((ni = mNodeInfoManager->GetNodeInfo(localName, prefix,
+                                                nameSpaceID)) ? NS_OK : NS_ERROR_NO_INTERFACE);
     NS_ENSURE_SUCCESS(rv, rv);
 
     aName.SetTo(ni);
@@ -533,8 +532,7 @@
                                  getter_AddRefs(localName), &nameSpaceID);
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  nsresult rv = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID,
-                                              getter_AddRefs(nodeInfo));
+  nsresult rv = ((nodeInfo = mNodeInfoManager->GetNodeInfo(localName, prefix, nameSpaceID)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   switch (mState) {
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -3570,10 +3570,12 @@
         // into the element.  Get a nodeinfo from our nodeinfo manager
         // for this node.
         nsCOMPtr<nsINodeInfo> newNodeInfo;
-        rv = mNodeInfoManager->GetNodeInfo(aPrototype->mNodeInfo->NameAtom(),
+        {
+          newNodeInfo = mNodeInfoManager->GetNodeInfo(aPrototype->mNodeInfo->NameAtom(),
                                            aPrototype->mNodeInfo->GetPrefixAtom(),
-                                           aPrototype->mNodeInfo->NamespaceID(),
-                                           getter_AddRefs(newNodeInfo));
+                                           aPrototype->mNodeInfo->NamespaceID());
+          rv = newNodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+        }
         if (NS_FAILED(rv)) return rv;
         rv = NS_NewElement(getter_AddRefs(result), newNodeInfo->NamespaceID(),
                            newNodeInfo, PR_FALSE);
diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp
--- a/content/xul/document/src/nsXULPrototypeDocument.cpp
+++ b/content/xul/document/src/nsXULPrototypeDocument.cpp
@@ -363,9 +363,11 @@
         nsCOMPtr<nsINodeInfo> ni;
         nsAttrName* name = &aPrototype->mAttributes[i].mName;
         if (name->IsAtom()) {
-            rv = aPrototype->mNodeInfo->NodeInfoManager()->
-                GetNodeInfo(name->Atom(), nsnull, kNameSpaceID_None,
-                            getter_AddRefs(ni));
+            {
+              ni = aPrototype->mNodeInfo->NodeInfoManager()->
+                GetNodeInfo(name->Atom(), nsnull, kNameSpaceID_None);
+              rv = ni ? NS_OK : NS_ERROR_NO_INTERFACE;
+            }
             NS_ENSURE_SUCCESS(rv, rv);
         }
         else {
diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/content/xul/templates/src/nsXULContentBuilder.cpp
--- a/content/xul/templates/src/nsXULContentBuilder.cpp
+++ b/content/xul/templates/src/nsXULContentBuilder.cpp
@@ -1627,8 +1627,7 @@
     nsCOMPtr<nsIContent> result;
 
     nsCOMPtr<nsINodeInfo> nodeInfo;
-    doc->NodeInfoManager()->GetNodeInfo(aTag, nsnull, aNameSpaceID,
-                                        getter_AddRefs(nodeInfo));
+    nodeInfo = doc->NodeInfoManager()->GetNodeInfo(aTag, nsnull, aNameSpaceID);
 
     rv = NS_NewElement(getter_AddRefs(result), aNameSpaceID, nodeInfo,
                        PR_FALSE);
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -2009,9 +2009,8 @@
     // XXX Check if it's an image type we can handle...
 
     nsCOMPtr<nsINodeInfo> nodeInfo;
-    mDocument->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nsnull,
-                                              kNameSpaceID_None,
-                                              getter_AddRefs(nodeInfo));
+    nodeInfo = mDocument->NodeInfoManager()->GetNodeInfo(nsGkAtoms::img, nsnull,
+                                              kNameSpaceID_None);
 
     nsresult rv = NS_NewGenConImageContent(getter_AddRefs(content), nodeInfo,
                                            data.mContent.mImage);
diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -350,18 +350,15 @@
     nsCOMPtr<nsINodeInfo> htmlNodeInfo;
 
     // generate an html html element
-    nim->GetNodeInfo(nsGkAtoms::html, 0, kNameSpaceID_None,
-                     getter_AddRefs(htmlNodeInfo));
+    htmlNodeInfo = nim->GetNodeInfo(nsGkAtoms::html, 0, kNameSpaceID_None);
     nsCOMPtr<nsIContent> htmlElement = NS_NewHTMLHtmlElement(htmlNodeInfo);
 
     // generate an html head element
-    nim->GetNodeInfo(nsGkAtoms::head, 0, kNameSpaceID_None,
-                     getter_AddRefs(htmlNodeInfo));
+    htmlNodeInfo = nim->GetNodeInfo(nsGkAtoms::head, 0, kNameSpaceID_None);
     nsCOMPtr<nsIContent> headElement = NS_NewHTMLHeadElement(htmlNodeInfo);
 
     // generate an html body element
-    nim->GetNodeInfo(nsGkAtoms::body, 0, kNameSpaceID_None,
-                     getter_AddRefs(htmlNodeInfo));
+    htmlNodeInfo = nim->GetNodeInfo(nsGkAtoms::body, 0, kNameSpaceID_None);
     nsCOMPtr<nsIContent> bodyElement = NS_NewHTMLBodyElement(htmlNodeInfo);
 
     // blat in the structure
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1045,8 +1045,7 @@
     return NS_ERROR_OUT_OF_MEMORY;
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_None,
-                     getter_AddRefs(nodeInfo));
+  nodeInfo = nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_None);
 
   // create button which drops the list down
   NS_NewHTMLElement(getter_AddRefs(mButtonContent), nodeInfo, PR_FALSE);
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -153,9 +153,8 @@
   nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::input, nsnull,
-                                      kNameSpaceID_None,
-                                      getter_AddRefs(nodeInfo));
+  nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::input, nsnull,
+                                      kNameSpaceID_None);
 
   // Create the text content
   NS_NewHTMLElement(getter_AddRefs(mTextContent), nodeInfo, PR_FALSE);
diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp
--- a/layout/forms/nsIsIndexFrame.cpp
+++ b/layout/forms/nsIsIndexFrame.cpp
@@ -191,8 +191,7 @@
 
   // Create an hr
   nsCOMPtr<nsINodeInfo> hrInfo;
-  nimgr->GetNodeInfo(nsGkAtoms::hr, nsnull, kNameSpaceID_None,
-                     getter_AddRefs(hrInfo));
+  hrInfo = nimgr->GetNodeInfo(nsGkAtoms::hr, nsnull, kNameSpaceID_None);
 
   NS_NewHTMLElement(getter_AddRefs(mPreHr), hrInfo, PR_FALSE);
   if (!mPreHr || !aElements.AppendElement(mPreHr))
@@ -210,8 +209,7 @@
 
   // Create text input field
   nsCOMPtr<nsINodeInfo> inputInfo;
-  nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_None,
-                     getter_AddRefs(inputInfo));
+  inputInfo = nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_None);
 
   NS_NewHTMLElement(getter_AddRefs(mInputContent), inputInfo, PR_FALSE);
   if (!mInputContent)
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -1695,9 +1695,8 @@
 
   // Now create a DIV and add it to the anonymous content child list.
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  nsresult rv = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nsnull,
-                                                    kNameSpaceID_XHTML,
-                                                    getter_AddRefs(nodeInfo));
+  nsresult rv = ((nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nsnull,
+                                                    kNameSpaceID_XHTML)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_NewHTMLElement(getter_AddRefs(mAnonymousDiv), nodeInfo, PR_FALSE);
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1696,8 +1696,11 @@
   nsNodeInfoManager *nodeInfoManager =
     presContext->Document()->NodeInfoManager();
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollbar, nsnull,
-                                    kNameSpaceID_XUL, getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollbar, nsnull,
+                                    kNameSpaceID_XUL);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (canHaveHorizontal) {
@@ -1721,8 +1724,8 @@
   }
 
   if (canHaveHorizontal && canHaveVertical) {
-    nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollcorner, nsnull,
-                                 kNameSpaceID_XUL, getter_AddRefs(nodeInfo));
+    nodeInfo = nodeInfoManager->GetNodeInfo(nsGkAtoms::scrollcorner, nsnull,
+                                 kNameSpaceID_XUL);
     rv = NS_NewElement(getter_AddRefs(mScrollCornerContent),
                        kNameSpaceID_XUL, nodeInfo, PR_FALSE);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -121,9 +121,8 @@
 
   // create the top-secret popupgroup node. shhhhh!
   nsCOMPtr<nsINodeInfo> nodeInfo;
-  nsresult rv = nodeInfoManager->GetNodeInfo(nsGkAtoms::popupgroup,
-                                             nsnull, kNameSpaceID_XUL,
-                                             getter_AddRefs(nodeInfo));
+  nsresult rv = ((nodeInfo = nodeInfoManager->GetNodeInfo(nsGkAtoms::popupgroup,
+                                             nsnull, kNameSpaceID_XUL)) ? NS_OK : NS_ERROR_NO_INTERFACE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_NewXULElement(getter_AddRefs(mPopupgroupContent), nodeInfo);
@@ -133,8 +132,11 @@
     return NS_ERROR_OUT_OF_MEMORY;
 
   // create the top-secret default tooltip node. shhhhh!
-  rv = nodeInfoManager->GetNodeInfo(nsGkAtoms::tooltip, nsnull,
-                                    kNameSpaceID_XUL, getter_AddRefs(nodeInfo));
+  {
+    nodeInfo = nodeInfoManager->GetNodeInfo(nsGkAtoms::tooltip, nsnull,
+                                    kNameSpaceID_XUL);
+    rv = nodeInfo ? NS_OK : NS_ERROR_NO_INTERFACE;
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_NewXULElement(getter_AddRefs(mTooltipContent), nodeInfo);