diff -r 834818d4af69 -r 27747ed45e84 src/sim/sim_events.hh
--- a/src/sim/sim_events.hh	Tue Jan 04 14:42:09 2011 -0800
+++ b/src/sim/sim_events.hh	Tue Jan 04 14:42:22 2011 -0800
@@ -55,7 +55,7 @@
     virtual const char *description() const;
 };
 
-class CountedDrainEvent : public SimLoopExitEvent
+class CountedDrainEvent : public Event
 {
   private:
     // Count of how many objects have not yet drained
diff -r 834818d4af69 -r 27747ed45e84 src/sim/sim_events.cc
--- a/src/sim/sim_events.cc	Tue Jan 04 14:42:09 2011 -0800
+++ b/src/sim/sim_events.cc	Tue Jan 04 14:42:22 2011 -0800
@@ -85,14 +85,14 @@
 }
 
 CountedDrainEvent::CountedDrainEvent()
-    : SimLoopExitEvent("Finished drain", 0), count(0)
+    : count(0)
 { }
 
 void
 CountedDrainEvent::process()
 {
     if (--count == 0)
-        exitSimLoop(cause, code);
+        exitSimLoop("Finished drain", 0);
 }
 
 //