diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c
index 09fbc34cf4..e09b245e82 100644
--- a/gtk/a11y/gtkatspicontext.c
+++ b/gtk/a11y/gtkatspicontext.c
@@ -1401,14 +1401,6 @@ gtk_at_spi_context_finalize (GObject *gobject)
   G_OBJECT_CLASS (gtk_at_spi_context_parent_class)->finalize (gobject);
 }
 
-static void
-gtk_at_spi_context_constructed (GObject *gobject)
-{
-  GtkAtSpiContext *self G_GNUC_UNUSED = GTK_AT_SPI_CONTEXT (gobject);
-
-  G_OBJECT_CLASS (gtk_at_spi_context_parent_class)->constructed (gobject);
-}
-
 static const char *get_bus_address (GdkDisplay *display);
 
 static void
@@ -1516,7 +1508,6 @@ gtk_at_spi_context_class_init (GtkAtSpiContextClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GtkATContextClass *context_class = GTK_AT_CONTEXT_CLASS (klass);
 
-  gobject_class->constructed = gtk_at_spi_context_constructed;
   gobject_class->finalize = gtk_at_spi_context_finalize;
 
   context_class->realize = gtk_at_spi_context_realize;
diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c
index d3b488b0ae..8727851add 100644
--- a/gtk/a11y/gtkatspiroot.c
+++ b/gtk/a11y/gtkatspiroot.c
@@ -96,7 +96,7 @@ gtk_at_spi_root_finalize (GObject *gobject)
   g_free (self->desktop_name);
   g_free (self->desktop_path);
 
-  G_OBJECT_CLASS (gtk_at_spi_root_parent_class)->dispose (gobject);
+  G_OBJECT_CLASS (gtk_at_spi_root_parent_class)->finalize (gobject);
 }
 
 static void
diff --git a/gtk/gtkatcontext.c b/gtk/gtkatcontext.c
index 1b925def66..e1f6cd981a 100644
--- a/gtk/gtkatcontext.c
+++ b/gtk/gtkatcontext.c
@@ -604,14 +604,10 @@ static const struct {
                                      GtkAccessible    *accessible,
                                      GdkDisplay       *display);
 } a11y_backends[] = {
-#if defined(GDK_WINDOWING_WAYLAND)
-  { "AT-SPI (Wayland)", "atspi", gtk_at_spi_create_context },
-#endif
-#if defined(GDK_WINDOWING_X11)
-  { "AT-SPI (X11)", "atspi", gtk_at_spi_create_context },
+#if defined(GDK_WINDOWING_WAYLAND) || defined(GDK_WINDOWING_X11)
+  { "AT-SPI", "atspi", gtk_at_spi_create_context },
 #endif
   { "Test", "test", gtk_test_at_context_new },
-  { NULL, NULL, NULL },
 };
 
 /**
@@ -634,6 +630,7 @@ gtk_at_context_create (GtkAccessibleRole  accessible_role,
                        GdkDisplay        *display)
 {
   static const char *gtk_a11y_env;
+  GtkATContext *res = NULL;
 
   if (gtk_a11y_env == NULL)
     {
@@ -661,12 +658,9 @@ gtk_at_context_create (GtkAccessibleRole  accessible_role,
   if (g_ascii_strcasecmp (gtk_a11y_env, "none") == 0)
     return NULL;
 
-  GtkATContext *res = NULL;
-
-  for (guint i = 0; i < G_N_ELEMENTS (a11y_backends); i++)
+  for (size_t i = 0; i < G_N_ELEMENTS (a11y_backends); i++)
     {
-      if (a11y_backends[i].name == NULL)
-        break;
+      g_assert (a11y_backends[i].name != NULL);
 
       if (a11y_backends[i].create_context != NULL &&
           (*gtk_a11y_env == '0' || g_ascii_strcasecmp (a11y_backends[i].env_name, gtk_a11y_env) == 0))