--- a/src/simulator/simulator.cc	Wed May 02 09:18:18 2007 +0200
+++ b/src/simulator/simulator.cc	Wed May 02 10:20:44 2007 +0200
@@ -62,7 +62,7 @@
   void ScheduleNow (EventImpl *event);
   void ScheduleDestroy (EventImpl *event);
   void Remove (EventId ev);
-  void Cancel (EventId ev);
+  void Cancel (EventId &ev);
   bool IsExpired (EventId ev);
   void Run (void);
   Time Now (void) const;
@@ -258,10 +258,9 @@
 }
 
 void
-SimulatorPrivate::Cancel (EventId id)
+SimulatorPrivate::Cancel (EventId &id)
 {
-  EventImpl *ev = id.GetEventImpl ();
-  ev->Cancel ();
+  id.Cancel ();
 }
 
 bool
@@ -453,7 +452,7 @@
 }
 
 void
-Simulator::Cancel (EventId ev)
+Simulator::Cancel (EventId &ev)
 {
   return GetPriv ()->Cancel (ev);
 }