diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp b/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
index 273af8fc7c8..300899a6dd8 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
@@ -84,7 +84,7 @@ getSpec(nsIChannel* aChannel, nsAString& aSpec)
 
     nsCAutoString spec;
     uri->GetSpec(spec);
-    aSpec.Append(NS_ConvertUTF8toUCS2(spec));
+    AppendUTF8toUTF16(spec, aSpec);
 }
 
 class txStylesheetSink : public nsIXMLContentSink,
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
index 700deb75a27..c2c5e4be3eb 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
@@ -656,8 +656,7 @@ txMozillaXSLTProcessor::LoadStyleSheet(nsIURI* aUri, nsILoadGroup* aLoadGroup,
         nsCAutoString spec;
         if (aUri) {
             aUri->GetSpec(spec);
-            // XXX use CopyUTF8toUCS2 once it's there
-            mSourceText = NS_ConvertUTF8toUCS2(spec);
+            CopyUTF8toUTF16(spec, mSourceText);
         }
         reportError(rv, nsnull, nsnull);
     }
diff --git a/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp b/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
index 7e18d4bf808..784eb66ca86 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
@@ -64,9 +64,8 @@ txStylesheet::init()
     
     // Create default templates
     // element/root template
-    txInstruction** instrp = mContainerTemplate.StartAssignment();
-    *instrp = new txPushParams;
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    mContainerTemplate = new txPushParams;
+    NS_ENSURE_TRUE(mContainerTemplate, NS_ERROR_OUT_OF_MEMORY);
 
     nsAutoPtr<txNodeTest> nt(new txNodeTypeTest(txNodeTypeTest::NODE_TYPE));
     NS_ENSURE_TRUE(nt, NS_ERROR_OUT_OF_MEMORY);
@@ -74,28 +73,25 @@ txStylesheet::init()
     nsAutoPtr<Expr> nodeExpr(new LocationStep(nt, LocationStep::CHILD_AXIS));
     NS_ENSURE_TRUE(nodeExpr, NS_ERROR_OUT_OF_MEMORY);
 
-    instrp = &(*instrp)->mNext;
     txPushNewContext* pushContext = new txPushNewContext(nodeExpr);
-    *instrp = pushContext;
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    mContainerTemplate->mNext = pushContext;
+    NS_ENSURE_TRUE(pushContext, NS_ERROR_OUT_OF_MEMORY);
 
-    instrp = &(*instrp)->mNext;
     txApplyDefaultElementTemplate* applyTemplates =
         new txApplyDefaultElementTemplate;
-    *instrp = applyTemplates;
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    pushContext->mNext = applyTemplates;
+    NS_ENSURE_TRUE(applyTemplates, NS_ERROR_OUT_OF_MEMORY);
 
-    instrp = &(*instrp)->mNext;
-    *instrp = new txLoopNodeSet(applyTemplates);
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    txLoopNodeSet* loopNodeSet = new txLoopNodeSet(applyTemplates);
+    applyTemplates->mNext = loopNodeSet;
+    NS_ENSURE_TRUE(loopNodeSet, NS_ERROR_OUT_OF_MEMORY);
 
-    instrp = &(*instrp)->mNext;
-    pushContext->mBailTarget = *instrp = new txPopParams;
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    txPopParams* popParams = new txPopParams;
+    pushContext->mBailTarget = loopNodeSet->mNext = popParams;
+    NS_ENSURE_TRUE(popParams, NS_ERROR_OUT_OF_MEMORY);
 
-    instrp = &(*instrp)->mNext;
-    *instrp = new txReturn();
-    NS_ENSURE_TRUE(*instrp, NS_ERROR_OUT_OF_MEMORY);
+    popParams->mNext = new txReturn();
+    NS_ENSURE_TRUE(popParams->mNext, NS_ERROR_OUT_OF_MEMORY);
 
     // attribute/textnode template
     nt = new txNodeTypeTest(txNodeTypeTest::NODE_TYPE);
@@ -105,10 +101,10 @@ txStylesheet::init()
     NS_ENSURE_TRUE(nodeExpr, NS_ERROR_OUT_OF_MEMORY);
 
     mCharactersTemplate = new txValueOf(nodeExpr, PR_FALSE);
-    NS_ENSURE_TRUE(mContainerTemplate, NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(mCharactersTemplate, NS_ERROR_OUT_OF_MEMORY);
 
     mCharactersTemplate->mNext = new txReturn();
-    NS_ENSURE_TRUE(mContainerTemplate->mNext, NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(mCharactersTemplate->mNext, NS_ERROR_OUT_OF_MEMORY);
 
     // pi/comment/namespace template
     mEmptyTemplate = new txReturn();