diff --git a/plugins/dummy/calls-dummy-call.c b/plugins/dummy/calls-dummy-call.c
index ab8146e..aa6270a 100644
--- a/plugins/dummy/calls-dummy-call.c
+++ b/plugins/dummy/calls-dummy-call.c
@@ -204,7 +204,6 @@ set_property (GObject      *object,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyCall *self = CALLS_DUMMY_CALL (object);
 
   if (self->inbound)
@@ -217,7 +216,7 @@ constructed (GObject *object)
       g_timeout_add_seconds (1, (GSourceFunc)outbound_timeout_cb, self);
     }
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_dummy_call_parent_class)->constructed (object);
 }
 
 
@@ -244,12 +243,11 @@ get_property (GObject      *object,
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyCall *self = CALLS_DUMMY_CALL (object);
 
   g_free (self->number);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_dummy_call_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/dummy/calls-dummy-origin.c b/plugins/dummy/calls-dummy-origin.c
index 2e3c61b..45346c4 100644
--- a/plugins/dummy/calls-dummy-origin.c
+++ b/plugins/dummy/calls-dummy-origin.c
@@ -217,24 +217,22 @@ set_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyOrigin *self = CALLS_DUMMY_ORIGIN (object);
 
   remove_calls (self, NULL);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_dummy_origin_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyOrigin *self = CALLS_DUMMY_ORIGIN (object);
 
   g_string_free (self->name, TRUE);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_dummy_origin_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/dummy/calls-dummy-provider.c b/plugins/dummy/calls-dummy-provider.c
index d5427af..5201da7 100644
--- a/plugins/dummy/calls-dummy-provider.c
+++ b/plugins/dummy/calls-dummy-provider.c
@@ -102,7 +102,6 @@ usr1_handler (CallsDummyProvider *self)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyProvider *self = CALLS_DUMMY_PROVIDER (object);
 
   calls_dummy_provider_add_origin (self, "Dummy origin");
@@ -111,7 +110,7 @@ constructed (GObject *object)
                      (GSourceFunc)usr1_handler,
                      self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_dummy_provider_parent_class)->constructed (object);
 }
 
 
@@ -136,13 +135,12 @@ get_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsDummyProvider *self = CALLS_DUMMY_PROVIDER (object);
 
   g_list_free_full (self->origins, g_object_unref);
   self->origins = NULL;
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_dummy_provider_parent_class)->dispose (object);
 }
 
 
diff --git a/plugins/mm/calls-mm-call.c b/plugins/mm/calls-mm-call.c
index eef4df9..52b298a 100644
--- a/plugins/mm/calls-mm-call.c
+++ b/plugins/mm/calls-mm-call.c
@@ -311,7 +311,6 @@ set_property (GObject      *object,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMCall *self = CALLS_MM_CALL (object);
   MmGdbusCall *gdbus_call = MM_GDBUS_CALL (self->mm_call);
   MMCallState state;
@@ -336,7 +335,7 @@ constructed (GObject *object)
       start_call (CALLS_CALL (self));
     }
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_mm_call_parent_class)->constructed (object);
 }
 
 
@@ -365,25 +364,23 @@ get_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMCall *self = CALLS_MM_CALL (object);
 
   g_clear_object (&self->mm_call);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_mm_call_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMCall *self = CALLS_MM_CALL (object);
 
   g_free (self->disconnect_reason);
   g_string_free (self->number, TRUE);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_mm_call_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/mm/calls-mm-origin.c b/plugins/mm/calls-mm-origin.c
index 588359a..d128c47 100644
--- a/plugins/mm/calls-mm-origin.c
+++ b/plugins/mm/calls-mm-origin.c
@@ -446,7 +446,6 @@ modem_get_name (MMModem *modem)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
   MmGdbusModemVoice *gdbus_voice;
 
@@ -466,33 +465,31 @@ constructed (GObject *object)
      NULL,
      (GAsyncReadyCallback) list_calls_cb,
      self);
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_mm_origin_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
 
   remove_calls (self, NULL);
   g_clear_object (&self->mm_obj);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_mm_origin_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
 
   g_hash_table_unref (self->calls);
   g_free (self->name);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_mm_origin_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/mm/calls-mm-provider.c b/plugins/mm/calls-mm-provider.c
index a4742d1..41f3b20 100644
--- a/plugins/mm/calls-mm-provider.c
+++ b/plugins/mm/calls-mm-provider.c
@@ -357,7 +357,6 @@ mm_vanished_cb (GDBusConnection *connection,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMProvider *self = CALLS_MM_PROVIDER (object);
 
   self->watch_id =
@@ -370,7 +369,7 @@ constructed (GObject *object)
 
   g_debug ("Watching for ModemManager");
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_mm_provider_parent_class)->constructed (object);
 }
 
 
@@ -397,7 +396,6 @@ get_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMProvider *self = CALLS_MM_PROVIDER (object);
 
   if (self->watch_id)
@@ -408,20 +406,19 @@ dispose (GObject *object)
 
   clear_dbus (self);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_mm_provider_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMMProvider *self = CALLS_MM_PROVIDER (object);
 
   g_hash_table_unref (self->origins);
   g_free (self->status);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_mm_provider_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/ofono/calls-ofono-call.c b/plugins/ofono/calls-ofono-call.c
index aee1a57..aca04f8 100644
--- a/plugins/ofono/calls-ofono-call.c
+++ b/plugins/ofono/calls-ofono-call.c
@@ -280,7 +280,6 @@ disconnect_reason_cb (CallsOfonoCall *self,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoCall *self = CALLS_OFONO_CALL (object);
 
   g_return_if_fail (self->voice_call != NULL);
@@ -290,33 +289,31 @@ constructed (GObject *object)
   g_signal_connect_swapped (self->voice_call, "disconnect-reason",
                             G_CALLBACK (disconnect_reason_cb), self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_ofono_call_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoCall *self = CALLS_OFONO_CALL (object);
 
   g_clear_object (&self->voice_call);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_ofono_call_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoCall *self = CALLS_OFONO_CALL (object);
 
   g_free (self->disconnect_reason);
   g_free (self->name);
   g_free (self->number);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_ofono_call_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/ofono/calls-ofono-origin.c b/plugins/ofono/calls-ofono-origin.c
index 619a196..d9c9d3a 100644
--- a/plugins/ofono/calls-ofono-origin.c
+++ b/plugins/ofono/calls-ofono-origin.c
@@ -448,7 +448,6 @@ voice_new_cb (GDBusConnection  *connection,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoOrigin *self = CALLS_OFONO_ORIGIN (object);
   GDBusProxy *modem_proxy;
   gchar *name;
@@ -478,28 +477,26 @@ constructed (GObject *object)
 
   g_clear_object (&self->modem);
      
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoOrigin *self = CALLS_OFONO_ORIGIN (object);
 
   remove_calls (self, NULL);
   g_clear_object (&self->modem);
   g_clear_object (&self->connection);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_ofono_origin_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoOrigin *self = CALLS_OFONO_ORIGIN (object);
 
   if (self->tone_queue)
@@ -508,7 +505,7 @@ finalize (GObject *object)
     }
   g_free (self->name);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_ofono_origin_parent_class)->finalize (object);
 }
 
 
diff --git a/plugins/ofono/calls-ofono-provider.c b/plugins/ofono/calls-ofono-provider.c
index 383fb64..2ae58c0 100644
--- a/plugins/ofono/calls-ofono-provider.c
+++ b/plugins/ofono/calls-ofono-provider.c
@@ -380,7 +380,6 @@ get_modems_cb (GDBOManager *manager,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoProvider *self = CALLS_OFONO_PROVIDER (object);
   GError *error = NULL;
 
@@ -415,33 +414,31 @@ constructed (GObject *object)
      (GAsyncReadyCallback) get_modems_cb,
      self);
      
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_ofono_provider_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoProvider *self = CALLS_OFONO_PROVIDER (object);
 
   g_clear_object (&self->manager);
   g_clear_object (&self->connection);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_ofono_provider_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoProvider *self = CALLS_OFONO_PROVIDER (object);
 
   g_hash_table_unref (self->origins);
   g_hash_table_unref (self->modems);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_ofono_provider_parent_class)->finalize (object);
 }
 
 
diff --git a/src/calls-application.c b/src/calls-application.c
index 3e2dd37..d0dfad9 100644
--- a/src/calls-application.c
+++ b/src/calls-application.c
@@ -423,7 +423,6 @@ app_open (GApplication  *application,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION);
   CallsApplication *self = CALLS_APPLICATION (object);
   GSimpleActionGroup *action_group;
 
@@ -432,7 +431,7 @@ constructed (GObject *object)
                                    actions, G_N_ELEMENTS (actions), self);
   g_object_unref (action_group);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_application_parent_class)->constructed (object);
 }
 
 
diff --git a/src/calls-call-data.c b/src/calls-call-data.c
index 5182a46..1295f30 100644
--- a/src/calls-call-data.c
+++ b/src/calls-call-data.c
@@ -113,13 +113,12 @@ get_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallData *self = CALLS_CALL_DATA (object);
 
   g_clear_object (&self->call);
   g_clear_object (&self->party);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_data_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-call-display.c b/src/calls-call-display.c
index bc09d71..1d8f276 100644
--- a/src/calls-call-display.c
+++ b/src/calls-call-display.c
@@ -513,7 +513,6 @@ ugly_hacks (CallsCallDisplay *self)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
   CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
 
   self->timer = g_timer_new ();
@@ -522,7 +521,7 @@ constructed (GObject *object)
 
   ugly_hacks (self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_call_display_parent_class)->constructed (object);
 }
 
 
@@ -565,24 +564,22 @@ calls_call_display_init (CallsCallDisplay *self)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
   CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
 
   stop_timeout (self);
   g_clear_object (&self->call);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_display_parent_class)->dispose (object);
 }
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
   CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
 
   g_timer_destroy (self->timer);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_call_display_parent_class)->finalize (object);
 }
 
 static void
diff --git a/src/calls-call-holder.c b/src/calls-call-holder.c
index ace37c2..f6585e6 100644
--- a/src/calls-call-holder.c
+++ b/src/calls-call-holder.c
@@ -134,14 +134,13 @@ calls_call_holder_init (CallsCallHolder *self)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallHolder *self = CALLS_CALL_HOLDER (object);
 
   g_clear_object (&self->selector_item);
   g_clear_object (&self->display);
   g_clear_object (&self->data);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_holder_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-call-record-row.c b/src/calls-call-record-row.c
index d668c40..acc61a0 100644
--- a/src/calls-call-record-row.c
+++ b/src/calls-call-record-row.c
@@ -477,7 +477,6 @@ set_property (GObject      *object,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *obj_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallRecordRow *self = CALLS_CALL_RECORD_ROW (object);
   gboolean inbound;
   GDateTime *answered;
@@ -497,7 +496,7 @@ constructed (GObject *object)
   contact_name_cb (self);
   request_contact_avatar (self);
 
-  obj_class->constructed (object);
+  G_OBJECT_CLASS (calls_call_record_row_parent_class)->constructed (object);
 }
 
 
@@ -524,7 +523,6 @@ get_property (GObject      *object,
 static void
 dispose (GObject *object)
 {
-  GObjectClass *obj_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallRecordRow *self = CALLS_CALL_RECORD_ROW (object);
 
   g_clear_object (&self->new_call);
@@ -537,7 +535,7 @@ dispose (GObject *object)
   calls_clear_signal (self->record, &self->end_notify_handler_id);
   g_clear_object (&self->record);
 
-  obj_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_record_row_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-call-record.c b/src/calls-call-record.c
index f6937f4..921dccb 100644
--- a/src/calls-call-record.c
+++ b/src/calls-call-record.c
@@ -146,7 +146,6 @@ set_property (GObject      *object,
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallRecord *self = CALLS_CALL_RECORD (object);
 
   g_clear_pointer (&self->end, g_date_time_unref);
@@ -154,7 +153,7 @@ finalize (GObject *object)
   g_clear_pointer (&self->start, g_date_time_unref);
   g_free (self->target);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_call_record_parent_class)->finalize (object);
 }
 
 
diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c
index 7458a80..e4f6531 100644
--- a/src/calls-call-selector-item.c
+++ b/src/calls-call-selector-item.c
@@ -152,12 +152,11 @@ calls_call_selector_item_init (CallsCallSelectorItem *self)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_EVENT_BOX);
   CallsCallSelectorItem *self = CALLS_CALL_SELECTOR_ITEM (object);
 
   g_clear_object (&self->display);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_selector_item_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-call-window.c b/src/calls-call-window.c
index 2f301c4..5316e19 100644
--- a/src/calls-call-window.c
+++ b/src/calls-call-window.c
@@ -639,7 +639,6 @@ notify (GObject    *object,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION_WINDOW);
   CallsCallWindow *self = CALLS_CALL_WINDOW (object);
 
   gtk_flow_box_bind_model (self->call_selector,
@@ -649,7 +648,7 @@ constructed (GObject *object)
 
   update_visibility (self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_call_window_parent_class)->constructed (object);
 }
 
 
@@ -665,7 +664,6 @@ calls_call_window_init (CallsCallWindow *self)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION_WINDOW);
   CallsCallWindow *self = CALLS_CALL_WINDOW (object);
 
   if (self->call_holders)
@@ -676,7 +674,7 @@ dispose (GObject *object)
   g_clear_object (&self->call_holders);
   stop_info_timeout (self);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_call_window_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-enumerate-params.c b/src/calls-enumerate-params.c
index 38bea18..9c055bd 100644
--- a/src/calls-enumerate-params.c
+++ b/src/calls-enumerate-params.c
@@ -98,7 +98,6 @@ set_property (GObject      *object,
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsEnumerateParams *self = CALLS_ENUMERATE_PARAMS (object);
 
   unsigned i;
@@ -107,7 +106,7 @@ finalize (GObject *object)
       g_hash_table_unref (self->callbacks[i]);
     }
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_enumerate_params_parent_class)->finalize (object);
 }
 
 
diff --git a/src/calls-history-box.c b/src/calls-history-box.c
index 38ae142..df17f80 100644
--- a/src/calls-history-box.c
+++ b/src/calls-history-box.c
@@ -151,7 +151,6 @@ set_property (GObject      *object,
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsHistoryBox *self = CALLS_HISTORY_BOX (object);
 
   g_assert (self->model != NULL);
@@ -174,21 +173,20 @@ constructed (GObject *object)
 
   update (self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_history_box_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsHistoryBox *self = CALLS_HISTORY_BOX (object);
 
   g_clear_object (&self->new_call);
   g_clear_object (&self->contacts);
   g_clear_object (&self->model);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_history_box_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index ccf7953..62e367d 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -254,7 +254,6 @@ set_up_provider (CallsMainWindow *self)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMainWindow *self = CALLS_MAIN_WINDOW (object);
   GSimpleActionGroup *simple_action_group;
   GtkContainer *main_stack = GTK_CONTAINER (self->main_stack);
@@ -309,7 +308,7 @@ constructed (GObject *object)
                                self->title_label,
                                NULL);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_main_window_parent_class)->constructed (object);
 }
 
 
@@ -317,7 +316,6 @@ constructed (GObject *object)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsMainWindow *self = CALLS_MAIN_WINDOW (object);
 
   stop_info_timeout (self);
@@ -325,7 +323,7 @@ dispose (GObject *object)
   g_clear_object (&self->record_store);
   g_clear_object (&self->provider);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_main_window_parent_class)->dispose (object);
 }
 
 
@@ -334,7 +332,6 @@ size_allocate (GtkWidget     *widget,
                GtkAllocation *allocation)
 {
   CallsMainWindow *self = CALLS_MAIN_WINDOW (widget);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (calls_main_window_parent_class);
 
   hdy_squeezer_set_child_enabled (self->squeezer,
                                   GTK_WIDGET (self->wide_switcher),
@@ -343,7 +340,7 @@ size_allocate (GtkWidget     *widget,
                                   GTK_WIDGET (self->narrow_switcher),
                                   allocation->width > 400);
 
-  widget_class->size_allocate (widget, allocation);
+  GTK_WIDGET_CLASS (calls_main_window_parent_class)->size_allocate (widget, allocation);
 }
 
 
diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c
index 2753f21..5d3e942 100644
--- a/src/calls-new-call-box.c
+++ b/src/calls-new-call-box.c
@@ -301,7 +301,6 @@ calls_new_call_box_init (CallsNewCallBox *self)
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsNewCallBox *self = CALLS_NEW_CALL_BOX (object);
 
   clear_dial_queue (self);
@@ -311,7 +310,7 @@ dispose (GObject *object)
       remove_origins (self);
     }
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_new_call_box_parent_class)->dispose (object);
 }
 
 
diff --git a/src/calls-party.c b/src/calls-party.c
index cc45fbc..60ff767 100644
--- a/src/calls-party.c
+++ b/src/calls-party.c
@@ -163,13 +163,12 @@ set_property (GObject      *object,
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsParty *self = CALLS_PARTY (object);
 
   CALLS_SET_PTR_PROPERTY (self->number, NULL);
   CALLS_SET_PTR_PROPERTY (self->name, NULL);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_party_parent_class)->finalize (object);
 }
 
 
diff --git a/src/calls-record-store.c b/src/calls-record-store.c
index 7c90497..0d6bdaa 100644
--- a/src/calls-record-store.c
+++ b/src/calls-record-store.c
@@ -680,20 +680,18 @@ set_up_provider (CallsRecordStore *self)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRecordStore *self = CALLS_RECORD_STORE (object);
 
   open_repo (self);
   set_up_provider (self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_record_store_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRecordStore *self = CALLS_RECORD_STORE (object);
 
   g_clear_object (&self->provider);
@@ -703,19 +701,18 @@ dispose (GObject *object)
   g_clear_object (&self->repository);
   close_adapter (self);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_record_store_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRecordStore *self = CALLS_RECORD_STORE (object);
 
   g_free (self->filename);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_record_store_parent_class)->finalize (object);
 }
 
 
diff --git a/src/calls-ringer.c b/src/calls-ringer.c
index 5ca2588..542a46d 100644
--- a/src/calls-ringer.c
+++ b/src/calls-ringer.c
@@ -389,38 +389,35 @@ set_up_provider (CallsRinger *self)
 static void
 constructed (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRinger *self = CALLS_RINGER (object);
 
   monitor_theme_name (self);
   create_ctx (self);
   set_up_provider (self);
 
-  parent_class->constructed (object);
+  G_OBJECT_CLASS (calls_ringer_parent_class)->constructed (object);
 }
 
 
 static void
 dispose (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRinger *self = CALLS_RINGER (object);
 
   g_clear_object (&self->provider);
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (calls_ringer_parent_class)->dispose (object);
 }
 
 
 static void
 finalize (GObject *object)
 {
-  GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsRinger *self = CALLS_RINGER (object);
 
   g_free (self->theme_name);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (calls_ringer_parent_class)->finalize (object);
 }