diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh
index e63ec7347..c1e021b63 100644
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/src/hb-ot-layout-gdef-private.hh
@@ -348,9 +348,8 @@ struct GDEF
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
     TRACE_SANITIZE ();
-    if (!SANITIZE (version)) return false;
-    if (unlikely (version.major != 1)) return false;
-    return SANITIZE_THIS2 (glyphClassDef, attachList) &&
+    return SANITIZE (version) && likely (version.major == 1) &&
+           SANITIZE_THIS2 (glyphClassDef, attachList) &&
 	   SANITIZE_THIS2 (ligCaretList, markAttachClassDef) &&
 	   (version < 0x00010002 || SANITIZE_THIS (markGlyphSetsDef[0]));
   }
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index f945ed98e..d07fe25b3 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -913,10 +913,9 @@ struct GSUBGPOS
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
     TRACE_SANITIZE ();
-    if (!SANITIZE (version)) return false;
-    if (unlikely (version.major != 1)) return false;
-    return SANITIZE_THIS (scriptList)
-        && SANITIZE_THIS (featureList)
+    return SANITIZE (version) && likely (version.major == 1)
+	&& SANITIZE_THIS (scriptList)
+	&& SANITIZE_THIS (featureList)
 	&& SANITIZE_THIS (lookupList);
   }