diff --git a/src/hb-map.hh b/src/hb-map.hh
index 4a1f75e65..36dfc3e5c 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -222,7 +222,6 @@ struct hb_hashmap_t
 	+ iter()
     | hb_map (&hb_pair_t<K, V>::first)
   )
-  // | hb_map ([&] (item_t i) { return i.key; })
 
   protected:
 
diff --git a/src/test-iter.cc b/src/test-iter.cc
index 63851a34e..273ba6c4f 100644
--- a/src/test-iter.cc
+++ b/src/test-iter.cc
@@ -206,7 +206,7 @@ main (int argc, char **argv)
   | hb_reduce ([&] (int acc, int value) -> int { return acc; }, 2)
   ;
 
-  using map_pair_t = decltype (*hb_iter (m));
+  using map_pair_t = hb_item_type<hb_map_t>;
   + hb_iter (m)
   | hb_map ([] (map_pair_t p) { return p.first * p.second; });