--- a/src/ChangeLog	Tue Feb 09 19:07:36 2010 -0600
+++ b/src/ChangeLog	Tue Feb 09 19:13:44 2010 -0600
@@ -1,3 +1,31 @@
+2010-02-09  Ben Wing  <ben@xemacs.org>
+
+	* dynarr.c (Dynarr_insert_many):
+	* dynarr.c (Dynarr_delete_many):
+	* emacs.c:
+	* emacs.c (pause_so_user_can_read_messages):
+	* emacs.c (Fkill_emacs):
+	* emacs.c (guts_of_fatal_error_signal):
+	* lisp.h:
+	* lisp.h (INLINE_ERROR_CHECK_ARGS):
+	* lisp.h (Dynarr_set_length_1):
+	* lisp.h (Dynarr_set_length):
+	* lisp.h (Dynarr_pop):
+	Add ERROR_CHECK_DYNARR, dynarr_checking_assert().  Use it.
+	Sort existing error-check categories in lisp.h, remove most of the
+	(unused) assert variations from most categories.  Add a long
+	comment about reorganizing the system by categories and
+	subcategories.  Create ERROR_CHECK_ANY if any error-checking
+	categories defined, and use it in emacs.c to define
+	USER_IS_DEVELOPING_XEMACS.
+
+	In emacs.c and cmdloop.c, don't display a message at early
+	shutdown or fatal shutdown when on Cygwin, only Windows native --
+	Cygwin has a working stderr that shows error output.
+
+	Update comment in Dynarr_verify_pos_atp().
+	
+
 2010-02-09  Ben Wing  <ben@xemacs.org>
 
 	* syswindows.h:

--- a/src/cmdloop.c	Tue Feb 09 19:07:36 2010 -0600
+++ b/src/cmdloop.c	Tue Feb 09 19:13:44 2010 -0600
@@ -161,7 +161,8 @@
       Fforce_debugging_signal (Qt);
     }
 #endif
-#ifdef HAVE_MS_WINDOWS
+#if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE)
+  /* Don't do this under Cygwin, since we have output on stderr. */
   Fmswindows_message_box (build_msg_string ("Initialization error"),
 			  Qnil, Qnil);
 #endif

--- a/src/dynarr.c	Tue Feb 09 19:07:36 2010 -0600
+++ b/src/dynarr.c	Tue Feb 09 19:13:44 2010 -0600
@@ -245,7 +245,7 @@
 
   /* #### This could conceivably be wrong, if code wants to access stuff
      between len and largest. */
-  structure_checking_assert (start >= 0 && start <= Dynarr_length (dy));
+  dynarr_checking_assert (start >= 0 && start <= Dynarr_length (dy));
 
   if (start != Dynarr_length (dy))
     {
@@ -267,8 +267,8 @@
 {
   Dynarr *dy = Dynarr_verify_mod (d);
 
-  structure_checking_assert (start >= 0 && len >= 0 &&
-			     start + len <= Dynarr_length (dy));
+  dynarr_checking_assert (start >= 0 && len >= 0 &&
+			  start + len <= Dynarr_length (dy));
 
   memmove ((char *) dy->base + start*dy->elsize,
 	   (char *) dy->base + (start + len)*dy->elsize,

--- a/src/emacs.c	Tue Feb 09 19:07:36 2010 -0600
+++ b/src/emacs.c	Tue Feb 09 19:13:44 2010 -0600
@@ -2,7 +2,7 @@
    Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2010 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -3334,6 +3334,21 @@
 /*                  exiting XEmacs (intended or not)                    */
 /************************************************************************/
 
+/* Do we need to pause with a message box so that messages can be read
+   at shutdown?  We do this is we have support for native Windows frames
+   and if we are native Windows.  The first part is because only when compiled
+   for native Windows frames do we have Fmswindows_message_box(), and
+   the second part is because we don't want to do this under Cygwin, where
+   we have a Unix-like environment and a working stderr where the messages
+   go.  The two conditions sound somewhat redundant (maybe we could just
+   use the second?) but they aren't completely: Theoretically (maybe with
+   MinGW?) we could imagine compiling under native Windows as the OS
+   but e.g. targetting only X Windows as the window system. --ben */
+
+#if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE)
+# define NEED_WINDOWS_MESSAGE_PAUSE
+#endif
+
 /*
 
 Info on intended/unintended exits:
@@ -3468,7 +3483,7 @@
   Vquit_flag = Qnil;
 }
 
-#ifdef HAVE_MS_WINDOWS
+#ifdef NEED_WINDOWS_MESSAGE_PAUSE
 static void
 pause_so_user_can_read_messages (int allow_further)
 {
@@ -3719,7 +3734,7 @@
 
   UNGCPRO;
 
-#ifdef HAVE_MS_WINDOWS
+#ifdef NEED_WINDOWS_MESSAGE_PAUSE
   pause_so_user_can_read_messages (1);
 #endif
 
@@ -3755,7 +3770,7 @@
    loops will fight each other and the return key will never be passed to
    the "pause" handler so that XEmacs's GPF handler can return, resignal
    the GPF, and properly go into the debugger.) */
-#if defined (ERROR_CHECK_TYPES) || defined (ERROR_CHECK_TEXT) || defined (ERROR_CHECK_GC) || defined (ERROR_CHECK_STRUCTURES)
+#ifdef ERROR_CHECK_ANY
 #define USER_IS_DEVELOPING_XEMACS
 #endif
 
@@ -3811,7 +3826,7 @@
           }
       }
 # endif
-#if defined (HAVE_MS_WINDOWS) && !defined (USER_IS_DEVELOPING_XEMACS)
+#if defined (NEED_WINDOWS_MESSAGE_PAUSE) && !defined (USER_IS_DEVELOPING_XEMACS)
       pause_so_user_can_read_messages (0);
 #endif
     }

--- a/src/lisp.h	Tue Feb 09 19:07:36 2010 -0600
+++ b/src/lisp.h	Tue Feb 09 19:13:44 2010 -0600
@@ -22,6 +22,9 @@
 
 /* Synched up with: FSF 19.30. */
 
+#ifndef INCLUDED_lisp_h_
+#define INCLUDED_lisp_h_
+
 /* Authorship:
 
    Based on code from pre-release FSF 19, c. 1991.
@@ -50,13 +53,6 @@
      Compiler-specific definitions modernized and moved to compiler.h.
 */
 
-#ifndef INCLUDED_lisp_h_
-#define INCLUDED_lisp_h_
-
-/************************************************************************/
-/*			  general definitions				*/
-/************************************************************************/
-
 /* Conventions in comments:
 
    "Mule-izing" is the process of going through a file and eliminating
@@ -91,7 +87,9 @@
 
    */
 
-/* -------------------------- include files --------------------- */
+/************************************************************************/
+/*                            include files                             */
+/************************************************************************/
 
 /* We include the following generally useful header files so that you
    don't have to worry about prototypes when using the standard C
@@ -116,12 +114,11 @@
 #endif
 
 
-/* -------------------------- error-checking ------------------------ */
-
-/* The large categories established by configure can be subdivided into
-   smaller subcategories, for problems in specific modules.  You can't
-   control this using configure, but you can manually stick in a define as
-   necessary. */
+/************************************************************************/
+/*                            error checking                            */
+/************************************************************************/
+
+/* ------------------------- large categories ------------------------- */
 
 /* How these work:
 
@@ -146,17 +143,56 @@
    the file and line (__FILE__, __LINE__) at place where the call occurs in
    the calling function; but nothing will get passed in when ERROR_CHECK_TEXT
    is not defined.
+
+   Currently the full bevy of *foo_checking_assert* macros are defined only
+   for `text' and `types'; for others, only the basic foo_checking_assert()
+   macro is defined.  Writing out all the variations for all possible error
+   categories would produce too much clutter.  If any of these become
+   needed, they can always be defined. */
+
+   /* #### I suggest revamping these and making proper use of the
+      category/subcategory system.  Here is one proposal:
+
+	Major category 	Minor categories
+	--------------------------------
+	Allocation
+			Malloc
+			Dynarr
+
+	Display
+			Extents
+			Glyphs
+			Redisplay
+
+	Execution
+			Byte-Code
+			Catch
+			Garbage Collection
+			Trapping-Problems
+
+	Lisp Objects
+			Buffers
+			Char Tables
+			Events
+			Lstreams
+			Hash Tables
+			Range Tables
+
+	Types
+			Lrecord Types
+			Subtypes
+
+	Text
+			Byte Positions
+			Conversion
+			Eistrings
+			Itext
+			Lisp Strings
+
+    --ben
 */
 
 
-#ifdef ERROR_CHECK_STRUCTURES
-/* Check for problems with the catch list and specbind stack */
-#define ERROR_CHECK_CATCH
-/* Check for insufficient use of call_trapping_problems(), particularly
-   due to glyph-related changes causing eval or QUIT within redisplay */
-#define ERROR_CHECK_TRAPPING_PROBLEMS
-#endif /* ERROR_CHECK_STRUCTURES */
-
 #define INLINE_ERROR_CHECK_ARGS , const char *__file__, int __line__
 #define INLINE_ERROR_CHECK_CALL , __FILE__, __LINE__
 #define DISABLED_INLINE_ERROR_CHECK_ARGS
@@ -169,6 +205,56 @@
    inline assert is disabled, params __file__ and __line__ do not exist. */
 #define disabled_inline_assert(assertion) disabled_assert (assertion)
 
+/* ------- the specific categories -------- */
+
+#if defined (ERROR_CHECK_BYTE_CODE) || defined (ERROR_CHECK_DISPLAY) || defined (ERROR_CHECK_EXTENTS) || defined (ERROR_CHECK_GC) || defined (ERROR_CHECK_GLYPHS) || defined (ERROR_CHECK_MALLOC) || defined (ERROR_CHECK_STRUCTURES) || defined (ERROR_CHECK_TEXT) || defined (ERROR_CHECK_TYPES)
+#define ERROR_CHECK_ANY
+#endif
+
+/* KEEP THESE SORTED! */
+
+#ifdef ERROR_CHECK_BYTE_CODE
+#define byte_code_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_BYTE_CODE */
+#define byte_code_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_BYTE_CODE */
+
+#ifdef ERROR_CHECK_DISPLAY
+#define display_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_DISPLAY */
+#define display_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_DISPLAY */
+
+#ifdef ERROR_CHECK_EXTENTS
+#define extent_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_EXTENTS */
+#define extent_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_EXTENTS */
+
+#ifdef ERROR_CHECK_GC
+#define gc_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_GC */
+#define gc_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_GC */
+
+#ifdef ERROR_CHECK_GLYPHS
+#define glyph_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_GLYPHS */
+#define glyph_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_GLYPHS */
+
+#ifdef ERROR_CHECK_MALLOC
+#define malloc_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_MALLOC */
+#define malloc_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_MALLOC */
+
+#ifdef ERROR_CHECK_STRUCTURES
+#define structure_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_STRUCTURES */
+#define structure_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_STRUCTURES */
+
 #ifdef ERROR_CHECK_TEXT
 #define text_checking_assert(assertion) assert (assertion)
 #define text_checking_assert_at_line(assertion, file, line) \
@@ -211,172 +297,51 @@
   disabled_assert_with_message (assertion, msg)
 #endif /* ERROR_CHECK_TYPES */
 
+/* ------------------------- small categories ------------------------- */
+
+/* The large categories established by configure can be subdivided into
+   smaller subcategories, for problems in specific modules.  You can't
+   control this using configure, but you can manually stick in a define as
+   necessary.
+
+   The idea is to go ahead and create a new type of error-checking and
+   have it turned on if the larger category it is a part of is also
+   turned on.  For example, ERROR_CHECK_DYNARR is considered a subcategory
+   of ERROR_CHECK_STRUCTURES.
+
+   We also define foo_checking_assert() macros for convenience, but
+   generally don't define the many variations of this macro as for the
+   major types above, because it produces too much clutter.  If any of
+   these become needed, they can always be defined. */
+
 #ifdef ERROR_CHECK_STRUCTURES
-#define structure_checking_assert(assertion) assert (assertion)
-#define structure_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_structure_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_STRUCTURE_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_STRUCTURE_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define structure_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_STRUCTURES */
-#define structure_checking_assert(assertion) disabled_assert (assertion)
-#define structure_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_structure_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_STRUCTURE_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_STRUCTURE_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define structure_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
+/* Check for problems with the catch list and specbind stack */
+#define ERROR_CHECK_CATCH
+/* Check for incoherent Dynarr structures, attempts to access Dynarr
+   positions out of range, reentrant use of Dynarrs through Dynarr locking,
+   etc. */
+#define ERROR_CHECK_DYNARR
+/* Check for insufficient use of call_trapping_problems(), particularly
+   due to glyph-related changes causing eval or QUIT within redisplay */
+#define ERROR_CHECK_TRAPPING_PROBLEMS
 #endif /* ERROR_CHECK_STRUCTURES */
 
-#ifdef ERROR_CHECK_GC
-#define gc_checking_assert(assertion) assert (assertion)
-#define gc_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_gc_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_GC_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_GC_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define gc_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_GC */
-#define gc_checking_assert(assertion) disabled_assert (assertion)
-#define gc_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_gc_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_GC_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_GC_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define gc_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_GC */
-
-#ifdef ERROR_CHECK_DISPLAY
-#define display_checking_assert(assertion) assert (assertion)
-#define display_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_display_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_DISPLAY_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_DISPLAY_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define display_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_DISPLAY */
-#define display_checking_assert(assertion) disabled_assert (assertion)
-#define display_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_display_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_DISPLAY_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_DISPLAY_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define display_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_DISPLAY */
-
-#ifdef ERROR_CHECK_GLYPHS
-#define glyph_checking_assert(assertion) assert (assertion)
-#define glyph_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_glyph_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_GLYPH_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_GLYPH_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define glyph_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_GLYPHS */
-#define glyph_checking_assert(assertion) disabled_assert (assertion)
-#define glyph_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_glyph_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_GLYPH_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_GLYPH_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define glyph_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_GLYPHS */
-
-#ifdef ERROR_CHECK_EXTENTS
-#define extent_checking_assert(assertion) assert (assertion)
-#define extent_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_extent_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_EXTENT_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_EXTENT_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define extent_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_EXTENTS */
-#define extent_checking_assert(assertion) disabled_assert (assertion)
-#define extent_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_extent_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_EXTENT_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_EXTENT_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define extent_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_EXTENTS */
-
-#ifdef ERROR_CHECK_MALLOC
-#define malloc_checking_assert(assertion) assert (assertion)
-#define malloc_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_malloc_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_MALLOC_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_MALLOC_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define malloc_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_MALLOC */
-#define malloc_checking_assert(assertion) disabled_assert (assertion)
-#define malloc_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_malloc_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_MALLOC_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_MALLOC_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define malloc_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_MALLOC */
-
-#ifdef ERROR_CHECK_BYTE_CODE
-#define byte_code_checking_assert(assertion) assert (assertion)
-#define byte_code_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_byte_code_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_BYTE_CODE_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_BYTE_CODE_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define byte_code_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
-#else /* not ERROR_CHECK_BYTE_CODE */
-#define byte_code_checking_assert(assertion) disabled_assert (assertion)
-#define byte_code_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_byte_code_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_BYTE_CODE_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_BYTE_CODE_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define byte_code_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
-#endif /* ERROR_CHECK_BYTE_CODE */
+#ifdef ERROR_CHECK_CATCH
+#define catch_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_CATCH */
+#define catch_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_CATCH */
+
+#ifdef ERROR_CHECK_DYNARR
+#define dynarr_checking_assert(assertion) assert (assertion)
+#else /* not ERROR_CHECK_DYNARR */
+#define dynarr_checking_assert(assertion) disabled_assert (assertion)
+#endif /* ERROR_CHECK_DYNARR */
 
 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
 #define trapping_problems_checking_assert(assertion) assert (assertion)
-#define trapping_problems_checking_assert_at_line(assertion, file, line) \
-  assert_at_line (assertion, file, line)
-#define inline_trapping_problems_checking_assert(assertion) inline_assert (assertion)
-#define INLINE_TRAPPING_PROBLEMS_CHECK_ARGS INLINE_ERROR_CHECK_ARGS
-#define INLINE_TRAPPING_PROBLEMS_CHECK_CALL INLINE_ERROR_CHECK_CALL
-#define trapping_problems_checking_assert_with_message(assertion, msg) \
-  assert_with_message (assertion, msg)
 #else /* not ERROR_CHECK_TRAPPING_PROBLEMS */
 #define trapping_problems_checking_assert(assertion) disabled_assert (assertion)
-#define trapping_problems_checking_assert_at_line(assertion, file, line) \
-  disabled_assert_at_line (assertion, file, line)
-#define inline_trapping_problems_checking_assert(assertion) \
-  disabled_inline_assert (assertion)
-#define INLINE_TRAPPING_PROBLEMS_CHECK_ARGS DISABLED_INLINE_ERROR_CHECK_ARGS
-#define INLINE_TRAPPING_PROBLEMS_CHECK_CALL DISABLED_INLINE_ERROR_CHECK_CALL
-#define trapping_problems_checking_assert_with_message(assertion, msg) \
-  disabled_assert_with_message (assertion, msg)
 #endif /* ERROR_CHECK_TRAPPING_PROBLEMS */
 
 /************************************************************************/
@@ -1770,7 +1735,7 @@
 #define DECLARE_DYNARR_LISP_IMP()
 #endif
 
-#ifdef ERROR_CHECK_STRUCTURES
+#ifdef ERROR_CHECK_DYNARR
 #define DECLARE_DYNARR_LOCKED()				\
   int locked;
 #else
@@ -1810,7 +1775,7 @@
 
 /************* Dynarr verification *************/
 
-#ifdef ERROR_CHECK_STRUCTURES
+#ifdef ERROR_CHECK_DYNARR
 DECLARE_INLINE_HEADER (
 int
 Dynarr_verify_pos_at (void *d, int pos, const Ascbyte *file, int line)
@@ -1831,7 +1796,7 @@
   Dynarr *dy = (Dynarr *) d;
   /* We use `largest', not `len', because the redisplay code often
      accesses stuff between len and largest. */
-  /* Code will often do something like ...
+  /* [[ Code will often do something like ...
 
      val = make_bit_vector_from_byte_vector (Dynarr_atp (dyn, 0),
 	                                     Dynarr_length (dyn));
@@ -1841,7 +1806,11 @@
      allocated array, but the array may not have ever been allocated and
      hence the return value is NULL.  But the length of 0 causes the
      pointer to never get checked.  These can occur throughout the code
-     so we put in a special check. */
+     so we put in a special check. --ben ]]
+
+     Update: The common idiom `Dynarr_atp (dyn, 0)' has been changed to
+     `Dynarr_begin (dyn)'.  Possibly this special check at POS 0 can be
+     done only for Dynarr_begin() not for general Dynarr_atp(). --ben */
   if (pos == 0 && dy->len_ == 0)
     return pos;
   /* #### It's vaguely possible that some code could legitimately want to
@@ -1854,7 +1823,7 @@
      really want to check for cases of accessing just past the end of
      memory, which is a likely off-by-one problem to occur and will usually
      not trigger a protection fault (instead, you'll just get random
-     behavior, possibly overwriting other memory, which is bad). */
+     behavior, possibly overwriting other memory, which is bad). --ben */
   assert_at_line (pos >= 0 && pos < dy->largest_, file, line);
   return pos;
 }
@@ -1878,9 +1847,9 @@
 #define Dynarr_verify_pos_at(d, pos, file, line) (pos)
 #define Dynarr_verify_pos_atp(d, pos, file, line) (pos)
 #define Dynarr_verify_pos_atp_allow_end(d, pos, file, line) (pos)
-#endif /* ERROR_CHECK_STRUCTURES */
-
-#ifdef ERROR_CHECK_STRUCTURES
+#endif /* ERROR_CHECK_DYNARR */
+
+#ifdef ERROR_CHECK_DYNARR
 DECLARE_INLINE_HEADER (
 Dynarr *
 Dynarr_verify_1 (void *d, const Ascbyte *file, int line)
@@ -1919,7 +1888,7 @@
 #define Dynarr_verify_mod(d) ((Dynarr *) d)
 #define Dynarr_lock(d) DO_NOTHING
 #define Dynarr_unlock(d) DO_NOTHING
-#endif /* ERROR_CHECK_STRUCTURES */
+#endif /* ERROR_CHECK_DYNARR */
 
 /************* Dynarr creation *************/
 
@@ -1943,8 +1912,7 @@
 
 /************* Dynarr access *************/
 
-#ifdef ERROR_CHECK_STRUCTURES
-/* Enabling this leads to crashes in Cygwin 1.7, gcc 3.4.4 */
+#ifdef ERROR_CHECK_DYNARR
 #define Dynarr_at(d, pos) \
   ((d)->base[Dynarr_verify_pos_at (d, pos, __FILE__, __LINE__)])
 #define Dynarr_atp_allow_end(d, pos) \
@@ -1983,7 +1951,7 @@
 #define Dynarr_set_length_1(d, n)					\
 do {									\
   Elemcount _dsl1_n = (n);						\
-  structure_checking_assert (_dsl1_n >= 0 && _dsl1_n <= Dynarr_max (d)); \
+  dynarr_checking_assert (_dsl1_n >= 0 && _dsl1_n <= Dynarr_max (d));	\
   (void) Dynarr_verify_mod (d);						\
   (d)->len_ = _dsl1_n;							\
   /* Use the raw field references here otherwise we get a crash because	\
@@ -1998,7 +1966,7 @@
 #define Dynarr_set_length(d, n)						\
 do {									\
   Elemcount _dsl_n = (n);						\
-  structure_checking_assert (_dsl_n >= 0 && _dsl_n <= Dynarr_largest (d)); \
+  dynarr_checking_assert (_dsl_n >= 0 && _dsl_n <= Dynarr_largest (d)); \
   Dynarr_set_length_1 (d, _dsl_n);					\
 } while (0)
 #define Dynarr_increment(d) \
@@ -2088,7 +2056,7 @@
 }
 
 #define Dynarr_pop(d)					\
-  (structure_checking_assert (Dynarr_length (d) > 0),	\
+  (dynarr_checking_assert (Dynarr_length (d) > 0),	\
    Dynarr_verify_mod (d)->len_--,			\
    Dynarr_at (d, Dynarr_length (d)))
 #define Dynarr_delete(d, i) Dynarr_delete_many (d, i, 1)