diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c
index 3e8f2777d..eaed9592f 100644
--- a/src/backends/meta-monitor-config-store.c
+++ b/src/backends/meta-monitor-config-store.c
@@ -936,6 +936,7 @@ handle_end_element (GMarkupParseContext  *context,
       }
 
     case STATE_STORE:
+      {
         g_assert (g_str_equal (element_name, "store"));
 
         if (parser->pending_store == -1)
@@ -960,8 +961,10 @@ handle_end_element (GMarkupParseContext  *context,
 
         parser->state = STATE_STORES;
         return;
+      }
 
     case STATE_STORES:
+      {
         g_assert (g_str_equal (element_name, "stores"));
 
         if (parser->config_store->has_stores_policy)
@@ -980,8 +983,10 @@ handle_end_element (GMarkupParseContext  *context,
 
         parser->state = STATE_POLICY;
         return;
+      }
 
     case STATE_DBUS:
+      {
         if (!parser->config_store->has_dbus_policy)
           {
             parser->config_store->has_dbus_policy = TRUE;
@@ -997,12 +1002,15 @@ handle_end_element (GMarkupParseContext  *context,
         parser->state = STATE_POLICY;
 
         return;
+      }
 
     case STATE_POLICY:
+      {
         g_assert (g_str_equal (element_name, "policy"));
 
         parser->state = STATE_MONITORS;
         return;
+      }
 
     case STATE_UNKNOWN:
       {