diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index 316a71135..d7217b925 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -698,7 +698,7 @@ struct DefaultUVS : SortedArrayOf<UnicodeValueRange, HBUINT32>
 		  | hb_apply ([&] (const unsigned addcnt)
 			      {
 				unsigned curEntry = (unsigned)_.startUnicodeValue + addcnt;
-				if (!hb_set_has (unicodes, curEntry)) return;
+				if (!unicodes->has (curEntry)) return;
 				count += 1;
 				if (lastCode == HB_MAP_VALUE_INVALID)
 				{
@@ -792,7 +792,7 @@ struct NonDefaultUVS : SortedArrayOf<UVSMapping, HBUINT32>
     + as_array ()
     | hb_filter ([&] (const UVSMapping& _)
 		 {
-		   return hb_set_has (unicodes, _.unicodeValue) || hb_set_has (glyphs, _.glyphID);
+		   return unicodes->has (_.unicodeValue) || glyphs->has (_.glyphID);
 		 })
     ;
 
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index f6a2df907..655911368 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -39,7 +39,7 @@ _add_gid_and_children (const OT::glyf::accelerator_t &glyf,
 		       hb_codepoint_t gid,
 		       hb_set_t *gids_to_retain)
 {
-  if (hb_set_has (gids_to_retain, gid))
+  if (gids_to_retain->has (gid))
     // Already visited this gid, ignore.
     return;