diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index 605d75c06..2e70b9657 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -85,7 +85,7 @@ typedef struct OffsetTable
   {
     Tag t;
     t.set (tag);
-    // TODO bsearch
+    // TODO: bsearch (need to sort in sanitize)
     unsigned int count = numTables;
     for (unsigned int i = 0; i < count; i++)
     {
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index cfbca1def..2315df9fb 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -87,7 +87,7 @@ struct RecordArrayOf : ArrayOf<Record<Type> > {
   {
     Tag t;
     t.set (tag);
-    // TODO bsearch
+    // TODO: bsearch (need to sort in sanitize)
     const Record<Type> *a = this->array();
     unsigned int count = this->len;
     for (unsigned int i = 0; i < count; i++)
@@ -321,7 +321,7 @@ struct CoverageFormat1
       return NOT_COVERED;
     GlyphID gid;
     gid.set (glyph_id);
-    // TODO: bsearch
+    // TODO: bsearch (need to sort in sanitize)
     unsigned int num_glyphs = glyphArray.len;
     for (unsigned int i = 0; i < num_glyphs; i++)
       if (gid == glyphArray[i])
@@ -377,7 +377,7 @@ struct CoverageFormat2
   private:
   inline unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
-    // TODO: bsearch
+    // TODO: bsearch (need to sort in sanitize)
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
     {
@@ -497,7 +497,7 @@ struct ClassDefFormat2
   private:
   inline hb_ot_layout_class_t get_class (hb_codepoint_t glyph_id) const
   {
-    // TODO: bsearch
+    // TODO: bsearch (need to sort in sanitize)
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
     {