diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 7b60e337eb4..93ae573b5c9 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -526,8 +526,8 @@ PRInt32 CTextToken::GetTextLength(void) {
  *  @param   aScanner -- controller of underlying input source
  *  @return  error result
  */
-nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {;
-  static nsString theTerminals(NS_LITERAL_STRING("\n\r&<"));
+nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r&<"); // XXXjag
   nsresult  result=NS_OK;
   PRBool    done=PR_FALSE;
   nsReadingIterator<PRUnichar> origin, start, end;
@@ -897,7 +897,7 @@ PRInt32 CMarkupDeclToken::GetTokenType(void) {
  *  @return  error result
  */
 nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
-  static nsString theTerminals(NS_LITERAL_STRING("\n\r'\">"));
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r'\">"); // XXXjag
   nsresult  result=NS_OK;
   PRBool    done=PR_FALSE;
   PRUnichar quote=0;
@@ -1521,7 +1521,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
  */
 static
 nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){
-  static nsString theTerminals(NS_LITERAL_STRING("\b\t\n\r >"));
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r >"); // XXXjag
   nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_FALSE);
   
   //Let's force quotes if either the first or last char is quoted.
@@ -1570,7 +1570,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a
       }
       else {
           //If you're here, handle an unquoted key.
-        static nsAutoString theTerminals(NS_LITERAL_STRING("\b\t\n\r \"=>"));
+        static nsAutoString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r \"=>"); // XXXjag
         result=aScanner.ReadUntil(start,end,theTerminals,PR_FALSE);
       }
       if (!aRetainWhitespace) {
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 7b60e337eb4..93ae573b5c9 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -526,8 +526,8 @@ PRInt32 CTextToken::GetTextLength(void) {
  *  @param   aScanner -- controller of underlying input source
  *  @return  error result
  */
-nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {;
-  static nsString theTerminals(NS_LITERAL_STRING("\n\r&<"));
+nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r&<"); // XXXjag
   nsresult  result=NS_OK;
   PRBool    done=PR_FALSE;
   nsReadingIterator<PRUnichar> origin, start, end;
@@ -897,7 +897,7 @@ PRInt32 CMarkupDeclToken::GetTokenType(void) {
  *  @return  error result
  */
 nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) {
-  static nsString theTerminals(NS_LITERAL_STRING("\n\r'\">"));
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\n\r'\">"); // XXXjag
   nsresult  result=NS_OK;
   PRBool    done=PR_FALSE;
   PRUnichar quote=0;
@@ -1521,7 +1521,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
  */
 static
 nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){
-  static nsString theTerminals(NS_LITERAL_STRING("\b\t\n\r >"));
+  static nsString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r >"); // XXXjag
   nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_FALSE);
   
   //Let's force quotes if either the first or last char is quoted.
@@ -1570,7 +1570,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a
       }
       else {
           //If you're here, handle an unquoted key.
-        static nsAutoString theTerminals(NS_LITERAL_STRING("\b\t\n\r \"=>"));
+        static nsAutoString theTerminals = NS_ConvertASCIItoUCS2("\b\t\n\r \"=>"); // XXXjag
         result=aScanner.ReadUntil(start,end,theTerminals,PR_FALSE);
       }
       if (!aRetainWhitespace) {