--- a/src/event-stream.c	Wed Feb 24 01:58:04 2010 -0600
+++ b/src/event-stream.c	Wed Feb 24 19:04:27 2010 -0600
@@ -1293,7 +1293,7 @@
   Lisp_Object lid;
   id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
   lid = make_int (id);
-  if (id != XINT (lid)) ABORT ();
+  assert (id == XINT (lid));
   return lid;
 }
 
@@ -1372,7 +1372,7 @@
   Lisp_Object lid;
   id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
   lid = make_int (id);
-  if (id != XINT (lid)) ABORT ();
+  assert (id == XINT (lid));
   return lid;
 }
 
@@ -3742,8 +3742,7 @@
   {
     Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j];
 
-    if (NILP (e))
-      ABORT ();
+    assert (!NILP (e));
     XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil);
     if (++j >= recent_keys_ring_size)
       j = 0;