--- a/src/mule-coding.c	Wed Jan 20 07:05:57 2010 -0600
+++ b/src/mule-coding.c	Wed Feb 24 01:58:04 2010 -0600
@@ -1889,7 +1889,7 @@
 		  {
 		    Ibyte comstr[MAX_ICHAR_LEN];
 		    Bytecount len;
-		    Ichar emch = lookup_composite_char (Dynarr_atp (dst, 0),
+		    Ichar emch = lookup_composite_char (Dynarr_begin (dst),
 							 Dynarr_length (dst));
 		    dst = real_dst;
 		    len = set_itext_ichar (comstr, emch);
@@ -2928,16 +2928,16 @@
 {
   int i;
   
-  write_c_string (printcharfun, "(");
+  write_ascstring (printcharfun, "(");
   for (i = 0; i < 4; i++)
     {
       Lisp_Object charset = coding_system_charset (cs, i);
       if (i > 0)
-	write_c_string (printcharfun, ", ");
+	write_ascstring (printcharfun, ", ");
       write_fmt_string (printcharfun, "g%d=", i);
       print_internal (CHARSETP (charset) ? XCHARSET_NAME (charset) : charset, printcharfun, 0);
       if (XCODING_SYSTEM_ISO2022_FORCE_CHARSET_ON_OUTPUT (cs, i))
-	write_c_string (printcharfun, "(force)");
+	write_ascstring (printcharfun, "(force)");
     }
 
 #define FROB(prop)					        \
@@ -2969,7 +2969,7 @@
       {
 	write_fmt_string_lisp (printcharfun, ", output-charset-conversion=%s", 1, val);
       }
-    write_c_string (printcharfun, ")");
+    write_ascstring (printcharfun, ")");
   }
 }
 
@@ -3247,7 +3247,7 @@
 {
   struct iso2022_detector *data = DETECTION_STATE_DATA (st, iso2022);
   if (data->iso)
-    xfree (data->iso, struct iso2022_coding_stream *);
+    xfree (data->iso);
 }
 
 
@@ -3740,7 +3740,7 @@
           XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys)), 
          XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys), 
          (flags & QUERY_METHOD_IGNORE_INVALID_SEQUENCES ?
-          build_string("") :
+          build_ascstring("") :
           XCODING_SYSTEM_FIXED_WIDTH_INVALID_SEQUENCES_SKIP_CHARS (codesys)),
          fastmap, (int)(sizeof (fastmap)));
 
@@ -3801,17 +3801,12 @@
 
               if (flags & QUERY_METHOD_ERRORP)
                 {
-                  DECLARE_EISTRING (error_details);
-
-                  eicpy_ascii (error_details, "Cannot encode ");
-                  eicat_lstr (error_details,
-                              make_string_from_buffer (buf, fail_range_start, 
-                                                       pos - fail_range_start));
-                  eicat_ascii (error_details, " using coding system");
-
-                  signal_error (Qtext_conversion_error, 
-                                (const CIbyte *)(eidata (error_details)),
-                                XCODING_SYSTEM_NAME (codesys));
+                  signal_error_2
+		    (Qtext_conversion_error,
+		     "Cannot encode using coding system",
+		     make_string_from_buffer (buf, fail_range_start,
+					      pos - fail_range_start),
+		     XCODING_SYSTEM_NAME (codesys));
                 }
 
               if (NILP (result))