diff --git a/content/xslt/src/xml/txAttr.cpp b/content/xslt/src/xml/txAttr.cpp
index 1efe0683c626..1f1c818c508b 100644
--- a/content/xslt/src/xml/txAttr.cpp
+++ b/content/xslt/src/xml/txAttr.cpp
@@ -49,7 +49,7 @@
 //Construct an Attribute object using the specified name and document owner
 //
 Attr::Attr(const nsAString& name, Document* owner):
-      NodeDefinition(Node::ATTRIBUTE_NODE, name, EmptyString(), owner)
+      NodeDefinition(Node::ATTRIBUTE_NODE, name, nsString(), owner)
 {
   int idx = nodeName.FindChar(':');
   if (idx == kNotFound) {
@@ -78,7 +78,7 @@ Attr::Attr(const nsAString& name, Document* owner):
 Attr::Attr(const nsAString& aNamespaceURI,
            const nsAString& aName,
            Document* aOwner) :
-    NodeDefinition(Node::ATTRIBUTE_NODE, aName, EmptyString(), aOwner)
+    NodeDefinition(Node::ATTRIBUTE_NODE, aName, nsString(), aOwner)
 {
  if (aNamespaceURI.IsEmpty())
     mNamespaceID = kNameSpaceID_None;
diff --git a/content/xslt/src/xml/txDOM.h b/content/xslt/src/xml/txDOM.h
index 8aaa52129c54..5702c0bb287e 100644
--- a/content/xslt/src/xml/txDOM.h
+++ b/content/xslt/src/xml/txDOM.h
@@ -372,7 +372,7 @@ class DocumentFragment : public NodeDefinition
   private:
     friend class Document;
     DocumentFragment(Document* aOwner) :
-      NodeDefinition(Node::DOCUMENT_FRAGMENT_NODE, EmptyString(), aOwner)
+      NodeDefinition(Node::DOCUMENT_FRAGMENT_NODE, nsString(), aOwner)
     {
     };
 };
diff --git a/content/xslt/src/xml/txDocument.cpp b/content/xslt/src/xml/txDocument.cpp
index 8d981e5ebaaf..e75f8302853e 100644
--- a/content/xslt/src/xml/txDocument.cpp
+++ b/content/xslt/src/xml/txDocument.cpp
@@ -54,7 +54,7 @@
 //Construct a Document.  Currently no parameters are required, but the the
 //node constructor is called to identify the node type.
 //
-Document::Document() : NodeDefinition(Node::DOCUMENT_NODE, EmptyString(), NULL)
+Document::Document() : NodeDefinition(Node::DOCUMENT_NODE, nsString(), NULL)
 {
   mIDMap.Init(0);
   documentElement = nsnull;
diff --git a/content/xslt/src/xml/txElement.cpp b/content/xslt/src/xml/txElement.cpp
index a9e64c723c7a..e80a43f7725d 100644
--- a/content/xslt/src/xml/txElement.cpp
+++ b/content/xslt/src/xml/txElement.cpp
@@ -51,7 +51,7 @@
 //type.
 //
 Element::Element(const nsAString& tagName, Document* owner) :
-         NodeDefinition(Node::ELEMENT_NODE, tagName, EmptyString(), owner)
+         NodeDefinition(Node::ELEMENT_NODE, tagName, nsString(), owner)
 {
   mAttributes.ownerElement = this;
   mNamespaceID = kNameSpaceID_Unknown;
@@ -69,7 +69,7 @@ Element::Element(const nsAString& tagName, Document* owner) :
 Element::Element(const nsAString& aNamespaceURI,
                  const nsAString& aTagName,
                  Document* aOwner) :
-         NodeDefinition(Node::ELEMENT_NODE, aTagName, EmptyString(), aOwner)
+         NodeDefinition(Node::ELEMENT_NODE, aTagName, nsString(), aOwner)
 {
   Element(aTagName, aOwner);
   if (aNamespaceURI.IsEmpty())
diff --git a/content/xslt/src/xslt/txHTMLOutput.cpp b/content/xslt/src/xslt/txHTMLOutput.cpp
index f2396256bf2e..5c3d4adecd4d 100644
--- a/content/xslt/src/xslt/txHTMLOutput.cpp
+++ b/content/xslt/src/xslt/txHTMLOutput.cpp
@@ -225,7 +225,7 @@ void txHTMLOutput::attribute(const nsAString& aName,
                  }
             }
             if (!setAtt) {
-                setAtt = new txOutAttr(aNsID, localName, EmptyString());
+                setAtt = new txOutAttr(aNsID, localName, nsString());
                 setAtt->mShorthand = MB_TRUE;
                 mAttributes.add(setAtt);
             }
diff --git a/content/xslt/src/xslt/txInstructions.cpp b/content/xslt/src/xslt/txInstructions.cpp
index 1306c8297301..649ad92f578e 100644
--- a/content/xslt/src/xslt/txInstructions.cpp
+++ b/content/xslt/src/xslt/txInstructions.cpp
@@ -958,7 +958,7 @@ txStartElement::execute(txExecutionState& aEs)
     else {
         // we call characters with an empty string to "close" any element to
         // make sure that no attributes are added
-        aEs.mResultHandler->characters(EmptyString(), PR_FALSE);
+        aEs.mResultHandler->characters(nsString(), PR_FALSE);
     }
 
     rv = aEs.pushString(name);
diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/content/xslt/src/xslt/txMozillaTextOutput.cpp
index 9a440f6ff4ff..c3cf0b80c037 100644
--- a/content/xslt/src/xslt/txMozillaTextOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaTextOutput.cpp
@@ -66,7 +66,7 @@ txMozillaTextOutput::txMozillaTextOutput(nsIDOMDocumentFragment* aDest)
     aDest->GetOwnerDocument(getter_AddRefs(doc));
     NS_ASSERTION(doc, "unable to get ownerdocument");
     nsCOMPtr<nsIDOMText> textNode;
-    nsresult rv = doc->CreateTextNode(EmptyString(),
+    nsresult rv = doc->CreateTextNode(nsString(),
                                       getter_AddRefs(textNode));
     if (NS_FAILED(rv)) {
         return;
@@ -165,7 +165,7 @@ void txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
 
     nsCOMPtr<nsIDOMNSDocument> nsDoc = do_QueryInterface(mDocument);
     if (nsDoc) {
-        nsDoc->SetTitle(EmptyString());
+        nsDoc->SetTitle(nsString());
     }
 
     // Reset and set up document
@@ -293,7 +293,7 @@ void txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
     }
 
     nsCOMPtr<nsIDOMText> textNode;
-    mDocument->CreateTextNode(EmptyString(),
+    mDocument->CreateTextNode(nsString(),
                               getter_AddRefs(textNode));
     NS_ASSERTION(textNode, "Failed to create the text node");
     if (!textNode) {
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index bf6e2a39b395..0b6b3434a247 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -155,7 +155,7 @@ void txMozillaXMLOutput::attribute(const nsAString& aName,
         // Outputting HTML as XHTML, lowercase attribute names
         nsAutoString lowerName;
         TX_ToLowerCase(aName, lowerName);
-        element->SetAttributeNS(EmptyString(), lowerName,
+        element->SetAttributeNS(nsString(), lowerName,
                                 aValue);
     }
     else {
@@ -202,7 +202,7 @@ void txMozillaXMLOutput::endDocument()
     if (mCreatingNewDocument && !mHaveTitleElement) {
         nsCOMPtr<nsIDOMNSDocument> domDoc = do_QueryInterface(mDocument);
         if (domDoc) {
-            domDoc->SetTitle(EmptyString());
+            domDoc->SetTitle(nsString());
         }
     }
 
diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
index 3cdbec2bca55..92afc19a3cd4 100644
--- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -688,7 +688,7 @@ txMozillaXSLTProcessor::reportError(nsresult aResult,
             do_GetService(NS_STRINGBUNDLE_CONTRACTID);
         if (sbs) {
             nsXPIDLString errorText;
-            sbs->FormatStatusMessage(aResult, EmptyString().get(),
+            sbs->FormatStatusMessage(aResult, nsString().get(),
                                      getter_Copies(errorText));
 
             nsXPIDLString errorMessage;
diff --git a/content/xslt/src/xslt/txUnknownHandler.cpp b/content/xslt/src/xslt/txUnknownHandler.cpp
index cf52ee6d19db..4e3baa65d035 100644
--- a/content/xslt/src/xslt/txUnknownHandler.cpp
+++ b/content/xslt/src/xslt/txUnknownHandler.cpp
@@ -65,7 +65,7 @@ void txUnknownHandler::endDocument()
     // didn't create a document element. Switching to XML output mode
     // anyway.
 
-    nsresult rv = createHandlerAndFlush(eXMLOutput, EmptyString(),
+    nsresult rv = createHandlerAndFlush(eXMLOutput, nsString(),
                                         kNameSpaceID_None);
     if (NS_FAILED(rv))
         return;