Index: Skylark/Dispatch.cpp
===================================================================
--- Skylark/Dispatch.cpp	(revision 15129)
+++ Skylark/Dispatch.cpp	(working copy)
@@ -96,7 +96,7 @@
 		return String();
 	StringBuffer out;
 	MakeLink(out, sLinkMap()[q], arg);
-	return out;
+	return String(out);
 }
 
 String MakeLink(const HandlerId& id, const Vector<Value>& arg)
Index: Skylark/Exe.cpp
===================================================================
--- Skylark/Exe.cpp	(revision 15129)
+++ Skylark/Exe.cpp	(working copy)
@@ -354,7 +354,7 @@
 {
 	StringBuffer out;
 	EscapeHtml(out, s);
-	return out;
+	return String(out);
 }
 
 force_inline