--- a/src/keymap.c	Wed Feb 24 01:58:04 2010 -0600
+++ b/src/keymap.c	Wed Feb 24 19:04:27 2010 -0600
@@ -489,10 +489,10 @@
 #define FROB(num) XEMACS_MOD_BUTTON##num |
 #include "keymap-buttons.h"
                  0);
-  if ((modifiers & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_META | XEMACS_MOD_SUPER
-		     | XEMACS_MOD_HYPER | XEMACS_MOD_ALT | XEMACS_MOD_SHIFT))
-      != 0)
-    ABORT ();
+  assert ((modifiers & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_META |
+			 XEMACS_MOD_SUPER | XEMACS_MOD_HYPER |
+			 XEMACS_MOD_ALT | XEMACS_MOD_SHIFT))
+	  == 0);
 
   k = XKEYMAP (keymap);
 
@@ -566,8 +566,7 @@
   Lisp_Object tail;
   Lisp_Object *prev;
 
-  if (UNBOUNDP (keys))
-    ABORT ();
+  assert (!UNBOUNDP (keys));
 
   for (prev = &new_keys, tail = new_keys;
        ;
@@ -3129,11 +3128,9 @@
       key.keysym = keysym;
       key.modifiers = modifiers;
 
-      if (NILP (cmd))
-	ABORT ();
+      assert (!NILP (cmd));
       cmd = get_keymap (cmd, 0, 1);
-      if (!KEYMAPP (cmd))
-	ABORT ();
+      assert (KEYMAPP (cmd));
 
       vec = make_vector (XVECTOR_LENGTH (thisseq) + 1, Qnil);
       len = XVECTOR_LENGTH (thisseq);
@@ -3662,7 +3659,7 @@
 	  /* OK, the key is for real */
 	  if (target_buffer)
 	    {
-	      if (!firstonly) ABORT ();
+	      assert (firstonly);
 	      format_raw_keys (so_far, keys_count + 1, target_buffer);
 	      return make_int (1);
 	    }