--- a/src/insdel.c	Wed Jan 20 07:05:57 2010 -0600
+++ b/src/insdel.c	Wed Feb 24 01:58:04 2010 -0600
@@ -1305,11 +1305,12 @@
 /* Insert the null-terminated string S (in external format). */
 
 Charcount
-buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos, const char *s,
+buffer_insert_ascstring_1 (struct buffer *buf, Charbpos pos, const Ascbyte *s,
 			  int flags)
 {
   /* This function can GC */
-  const char *translated = GETTEXT (s);
+  const CIbyte *translated = GETTEXT (s);
+  ASSERT_ASCTEXT_ASCII (s);
   return buffer_insert_string_1 (buf, pos, (const Ibyte *) translated, Qnil,
 				 0, strlen (translated), flags);
 }
@@ -1837,9 +1838,9 @@
   if (!b->base_buffer)
     {
       BUFFER_FREE (b->text->beg);
-      xfree (b->text->changes, struct buffer_text_change_data *);
+      xfree (b->text->changes);
     }
-  xfree (b->changes, struct each_buffer_change_data *);
+  xfree (b->changes);
 
 #ifdef REGION_CACHE_NEEDS_WORK
   if (b->newline_cache)