diff --git a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
index 14c689d45c..a9759e08f6 100644
--- a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
+++ b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
@@ -51,14 +51,6 @@ struct _GncSxListTreeModelAdapter
     GtkTreeModelSort *real;
 };
 
-struct _GncSxListTreeModelAdapterClass
-{
-    GObjectClass parent;
-
-    /* This signal is emitted when the model is populated */
-    void (*model_populated) (GncSxListTreeModelAdapter *model, gpointer user_data);
-};
-
 /* Signal codes */
 enum
 {
@@ -92,12 +84,10 @@ gnc_sx_list_tree_model_adapter_class_init (GncSxListTreeModelAdapterClass *klass
         g_signal_new("model_populated",
                      G_TYPE_FROM_CLASS(obj_class),
                      G_SIGNAL_RUN_LAST,
-                     G_STRUCT_OFFSET (GncSxListTreeModelAdapterClass, model_populated),
+                     0,
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE, 0);
-
-    klass->model_populated = NULL;
 }
 
 static GtkTreeModelFlags
diff --git a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
index f391f9c0d9..e24bfa5d42 100644
--- a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
+++ b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
@@ -44,14 +44,7 @@
 G_BEGIN_DECLS
 
 #define GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER            (gnc_sx_list_tree_model_adapter_get_type ())
-#define GNC_SX_LIST_TREE_MODEL_ADAPTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER, GncSxListTreeModelAdapter))
-#define GNC_SX_LIST_TREE_MODEL_ADAPTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER, GncSxListTreeModelAdapterClass))
-#define GNC_IS_SX_LIST_TREE_MODEL_ADAPTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER))
-#define GNC_IS_SX_LIST_TREE_MODEL_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER))
-#define GNC_SX_LIST_TREE_MODEL_ADAPTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER, GncSxListTreeModelAdapterClass))
-
-typedef struct _GncSxListTreeModelAdapter GncSxListTreeModelAdapter;
-typedef struct _GncSxListTreeModelAdapterClass GncSxListTreeModelAdapterClass;
+G_DECLARE_FINAL_TYPE (GncSxListTreeModelAdapter, gnc_sx_list_tree_model_adapter, GNC, SX_LIST_TREE_MODEL_ADAPTER, GObject)
 
 // model columns
 enum
@@ -63,7 +56,6 @@ enum
     SXLTMA_COL_NEXT_OCCUR
 };
 
-GType gnc_sx_list_tree_model_adapter_get_type (void);
 GncSxListTreeModelAdapter* gnc_sx_list_tree_model_adapter_new (GncSxInstanceModel *instances);
 
 GncSxInstances* gnc_sx_list_tree_model_adapter_get_sx_instances (GncSxListTreeModelAdapter *model, GtkTreeIter *iter);