1 files changed, 6 insertions, 9 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 3c1609d97..71d4a5fb9 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -106,11 +106,9 @@ GType sp_event_context_get_type(void) {
  * Callback to set up the SPEventContext vtable.
  */
 static void sp_event_context_class_init(SPEventContextClass *klass) {
-    GObjectClass *object_class;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    object_class = (GObjectClass *) klass;
-
-    parent_class = (GObjectClass*) g_type_class_peek_parent(klass);
+    parent_class = G_OBJECT_CLASS(g_type_class_peek_parent(klass));
 
     object_class->dispose = sp_event_context_dispose;
 
@@ -1403,17 +1401,16 @@ gboolean sp_event_context_snap_watchdog_callback(gpointer data) {
         sp_event_context_virtual_root_handler(ec, dse->getEvent());
         break;
     case DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER: {
-        SPItem* item = NULL;
-        item = SP_ITEM(dse->getItem());
+        gpointer item = dse->getItem();
         if (item && SP_IS_ITEM(item)) {
-            sp_event_context_virtual_item_handler(ec, item, dse->getEvent());
+            sp_event_context_virtual_item_handler(ec, SP_ITEM(item), dse->getEvent());
         }
     }
         break;
     case DelayedSnapEvent::KNOT_HANDLER: {
-        SPKnot* knot = SP_KNOT(dse->getItem2());
+        gpointer knot = dse->getItem2();
         if (knot && SP_IS_KNOT(knot)) {
-            sp_knot_handler_request_position(dse->getEvent(), knot);
+            sp_knot_handler_request_position(dse->getEvent(), SP_KNOT(knot));
         }
     }
         break;