diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index 6582d592f..e4c8424ac 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -73,50 +73,62 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     case HB_SCRIPT_SYRIAC:
       return hb_ot_complex_shaper_arabic;
 
-    /* TODO: These are all the scripts that the ucd/IndicSyllabicCategory.txt covers.
-     * Quite possibly many of these need no shaping, and some other are encoded visually.
-     * Needs to be refined.
+#if 0
+    /* Note:
+     *
+     * These disabled scripts are listed in ucd/IndicSyllabicCategory.txt, but according
+     * to Martin Hosken do not require complex shaping.
+     *
+     * TODO We currently keep data for these scripts in our indic table.  Need to fix the
+     * generator to not do that.
      */
-    case HB_SCRIPT_BALINESE:
+
+    /* Simple? */
     case HB_SCRIPT_BATAK:
-    case HB_SCRIPT_BENGALI:
     case HB_SCRIPT_BRAHMI:
+    case HB_SCRIPT_HANUNOO:
+    case HB_SCRIPT_MEETEI_MAYEK:
+    case HB_SCRIPT_SAURASHTRA:
+
+    /* Simple */
+    case HB_SCRIPT_KAYAH_LI:
+    case HB_SCRIPT_LAO:
+    case HB_SCRIPT_LIMBU:
+    case HB_SCRIPT_PHAGS_PA:
+    case HB_SCRIPT_SYLOTI_NAGRI:
+    case HB_SCRIPT_TAGALOG:
+    case HB_SCRIPT_TAGBANWA:
+    case HB_SCRIPT_TAI_LE:
+    case HB_SCRIPT_TAI_VIET:
+    case HB_SCRIPT_THAI:
+    case HB_SCRIPT_TIBETAN:
+
+    /* May need Indic treatment in the future? */
+    case HB_SCRIPT_MYANMAR:
+#endif
+
+    case HB_SCRIPT_BALINESE:
+    case HB_SCRIPT_BENGALI:
     case HB_SCRIPT_BUGINESE:
     case HB_SCRIPT_BUHID:
     case HB_SCRIPT_CHAM:
     case HB_SCRIPT_DEVANAGARI:
     case HB_SCRIPT_GUJARATI:
     case HB_SCRIPT_GURMUKHI:
-    case HB_SCRIPT_HANUNOO:
     case HB_SCRIPT_JAVANESE:
     case HB_SCRIPT_KAITHI:
     case HB_SCRIPT_KANNADA:
-    case HB_SCRIPT_KAYAH_LI:
     case HB_SCRIPT_KHAROSHTHI:
     case HB_SCRIPT_KHMER:
-    case HB_SCRIPT_LAO:
     case HB_SCRIPT_LEPCHA:
-    case HB_SCRIPT_LIMBU:
     case HB_SCRIPT_MALAYALAM:
-    case HB_SCRIPT_MEETEI_MAYEK:
-    case HB_SCRIPT_MYANMAR:
     case HB_SCRIPT_NEW_TAI_LUE:
-    case HB_SCRIPT_ORIYA:
-    case HB_SCRIPT_PHAGS_PA:
-    case HB_SCRIPT_REJANG:
-    case HB_SCRIPT_SAURASHTRA:
+    case HB_SCRIPT_ORIYA: case HB_SCRIPT_REJANG:
     case HB_SCRIPT_SINHALA:
     case HB_SCRIPT_SUNDANESE:
-    case HB_SCRIPT_SYLOTI_NAGRI:
-    case HB_SCRIPT_TAGALOG:
-    case HB_SCRIPT_TAGBANWA:
-    case HB_SCRIPT_TAI_LE:
     case HB_SCRIPT_TAI_THAM:
-    case HB_SCRIPT_TAI_VIET:
     case HB_SCRIPT_TAMIL:
     case HB_SCRIPT_TELUGU:
-    case HB_SCRIPT_THAI:
-    case HB_SCRIPT_TIBETAN:
       return hb_ot_complex_shaper_indic;
 
     /* ^--- Add new shapers here */