diff --git a/src/hb-ot-meta-table.hh b/src/hb-ot-meta-table.hh
index cc31bfb32..37f627cad 100644
--- a/src/hb-ot-meta-table.hh
+++ b/src/hb-ot-meta-table.hh
@@ -82,11 +82,11 @@ struct meta
 			      unsigned int *count,
 			      hb_ot_meta_t *entries) const
     {
-      if (count && *count)
+      if (count)
       {
-	hb_array_t<const DataMap> array = table->dataMaps.sub_array (start_offset, count);
-	for (unsigned int i = 0; i < *count; i++)
-	  entries[i] = (hb_ot_meta_t) array[i].get_tag ();
+	hb_array_t<const DataMap> arr = table->dataMaps.sub_array (start_offset, count);
+	for (unsigned int i = 0; i < arr.length; i++)
+	  entries[i] = (hb_ot_meta_t) arr[i].get_tag ();
       }
       return table->dataMaps.len;
     }