diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am
index e0a1087a..0c8a4093 100644
--- a/moo/mooedit/Makefile.am
+++ b/moo/mooedit/Makefile.am
@@ -191,7 +191,7 @@ stamp-mooedit-enums.c: $(mooedit_enums_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 			--fhead "#include \"mooedit/mooedit-enums.h\"\n\n" \
 			--fprod "#include \"mooedit/@filename@\"\n\n" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n    static GType etype = 0;\n    if (etype == 0)\n    {\n        static const G@Type@Value values[] = {" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n    static GType etype;\n    if (G_UNLIKELY (!etype))\n    {\n        static const G@Type@Value values[] = {" \
 			--vprod "            { @VALUENAME@, (char*) \"@VALUENAME@\", (char*) \"@valuenick@\" }," \
 			--vtail "            { 0, NULL, NULL }\n        };\n        etype = g_@type@_register_static (\"@EnumName@\", values);\n    }\n    return etype;\n}\n\n" \
 		$(mooedit_enums_headers) ) > xgen-gtbc \