--- a/src/text.c	Sat Feb 06 03:59:18 2010 -0600
+++ b/src/text.c	Sat Feb 06 04:01:46 2010 -0600
@@ -4238,7 +4238,7 @@
       /* double zero-extend because we may be dealing with Unicode data */
       Dynarr_add (conversion_out_dynarr, '\0');
       Dynarr_add (conversion_out_dynarr, '\0');
-      sink->data.ptr = Dynarr_atp (conversion_out_dynarr, 0);
+      sink->data.ptr = Dynarr_begin (conversion_out_dynarr);
     }
 
   PROFILE_RECORD_EXITING_SECTION (QSin_internal_external_conversion);
@@ -4470,7 +4470,7 @@
 	 cases.  So we add a second zero, just like for external data
 	 (in that case, because we may be converting to Unicode). */
       Dynarr_add (conversion_in_dynarr, '\0');
-      sink->data.ptr = Dynarr_atp (conversion_in_dynarr, 0);
+      sink->data.ptr = Dynarr_begin (conversion_in_dynarr);
     }
 
   PROFILE_RECORD_EXITING_SECTION (QSin_internal_external_conversion);
@@ -4532,8 +4532,8 @@
 /* We handle here the cases where SRC is a Lisp_Object, internal data
    (sized or unsized), or external data (sized or unsized), and return type
    is unsized alloca() or malloc() data.  If the return type is a
-   Lisp_Object, use build_ext_string() for unsized external data,
-   make_ext_string() for sized external data.  If the return type needs to
+   Lisp_Object, use build_extstring() for unsized external data,
+   make_extstring() for sized external data.  If the return type needs to
    be sized data, use the *_TO_SIZED_*() macros, and for other more
    complicated cases, use the original TO_*_FORMAT() macros. */
 
@@ -4613,7 +4613,7 @@
   vals = Dynarr_atp (active_alloca_convert, i);
   assert (alloca_data);
   memcpy (alloca_data, vals->dst, vals->dst_size);
-  xfree (vals->dst, void *);
+  xfree (vals->dst);
   Dynarr_delete (active_alloca_convert, i);
   return alloca_data;
 }
@@ -5158,10 +5158,10 @@
 void
 vars_of_text (void)
 {
-  QSin_char_byte_conversion = build_msg_string ("(in char-byte conversion)");
+  QSin_char_byte_conversion = build_defer_string ("(in char-byte conversion)");
   staticpro (&QSin_char_byte_conversion);
   QSin_internal_external_conversion =
-    build_msg_string ("(in internal-external conversion)");
+    build_defer_string ("(in internal-external conversion)");
   staticpro (&QSin_internal_external_conversion);
 
 #ifdef ENABLE_COMPOSITE_CHARS