diff --git a/mozilla/gfx/src/mac/nsFontMetricsMac.cpp b/mozilla/gfx/src/mac/nsFontMetricsMac.cpp
index 0ab21a9c293..5724f029e86 100644
--- a/mozilla/gfx/src/mac/nsFontMetricsMac.cpp
+++ b/mozilla/gfx/src/mac/nsFontMetricsMac.cpp
@@ -215,22 +215,15 @@ void nsFontMetricsMac::RealizeFont()
 	unicodeMappingUtil = nsUnicodeMappingUtil::GetSingleton ();
 	if (unicodeMappingUtil)
 	{
-		const char		*theCString;
 		nsAutoString	theLangGroupString;
 
 		if (mLangGroup)
 			mLangGroup->ToString(theLangGroupString);
 		else
 			theLangGroupString.AssignWithConversion("ja");
-		theCString = theLangGroupString.GetBuffer ();
-		if (theCString)
-			theScriptCode = unicodeMappingUtil->MapLangGroupToScriptCode (theCString);
-		else
-		{
-			NS_ConvertUCS2toUTF8 theUnicodeString(theLangGroupString);
 
-			theScriptCode = unicodeMappingUtil->MapLangGroupToScriptCode(theUnicodeString.get());
-		}
+		theScriptCode = unicodeMappingUtil->MapLangGroupToScriptCode(
+		    NS_ConvertUCS2toUTF8(theLangGroupString).get());
 
 	}
 	else
diff --git a/mozilla/htmlparser/src/nsLoggingSink.cpp b/mozilla/htmlparser/src/nsLoggingSink.cpp
index 0c85be21a1d..6cd2a4d8504 100644
--- a/mozilla/htmlparser/src/nsLoggingSink.cpp
+++ b/mozilla/htmlparser/src/nsLoggingSink.cpp
@@ -700,7 +700,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
 				if (pos >= 0) {
 					tmp.Cut(pos, 1);
 				}
-				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", tmp.GetBuffer());
+				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", NS_LossyConvertUCS2toASCII(tmp).get());
 				break;
 
 			default:
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 365bc5ae45c..d083165997e 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -3294,7 +3294,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
 {
   PLUGIN_LOG(PLUGIN_LOG_NORMAL,
   ("nsPluginHostImpl::InstatiateFullPagePlugin Begin mime=%s, owner=%p, url=%s\n",
-  aMimeType, aOwner, aURLSpec.GetBuffer()));
+  aMimeType, aOwner, NS_LossyConvertUCS2toASCII(aURLSpec).get()));
 
   nsresult  rv;
   nsIURI    *url;
@@ -3351,7 +3351,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
 
   PLUGIN_LOG(PLUGIN_LOG_NORMAL,
   ("nsPluginHostImpl::InstatiateFullPagePlugin End mime=%s, rv=%d, owner=%p, url=%s\n",
-  aMimeType, rv, aOwner, aURLSpec.GetBuffer()));
+  aMimeType, rv, aOwner, NS_LossyConvertUCS2toASCII(aURLSpec).get()));
 
   return rv;
 }
diff --git a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
index 0c85be21a1d..6cd2a4d8504 100644
--- a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
+++ b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
@@ -700,7 +700,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
 				if (pos >= 0) {
 					tmp.Cut(pos, 1);
 				}
-				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", tmp.GetBuffer());
+				PR_fprintf(mOutput, "<entity value=\"%s\"/>\n", NS_LossyConvertUCS2toASCII(tmp).get());
 				break;
 
 			default:
diff --git a/mozilla/widget/src/os2/nsModule.cpp b/mozilla/widget/src/os2/nsModule.cpp
index 4a8f6916b7c..5436730e8bf 100644
--- a/mozilla/widget/src/os2/nsModule.cpp
+++ b/mozilla/widget/src/os2/nsModule.cpp
@@ -395,15 +395,7 @@ const char *nsWidgetModuleData::ConvertFromUcs( const PRUnichar *pText)
 
 const char *nsWidgetModuleData::ConvertFromUcs( const nsString &aString)
 {
-   const char *szRet = 0;
-   const PRUnichar *pUnicode = aString.get();
-
-   if( pUnicode)
-      szRet = ConvertFromUcs( pUnicode);
-   else
-      szRet = aString.GetBuffer(); // hrm.
-
-   return szRet;
+   return ConvertFromUcs( aString.get());
 }
 
 ATOM nsWidgetModuleData::GetAtom( const char *atomname)