diff --git a/src/hb-iter.hh b/src/hb-iter.hh
index 06dd94a05..5f2511baf 100644
--- a/src/hb-iter.hh
+++ b/src/hb-iter.hh
@@ -197,18 +197,18 @@ struct hb_is_iterator_of { enum {
  * Algorithms operating on iterators or iteratables.
  */
 
-template <typename C, typename V> inline
-  hb_enable_if_t (hb_is_iterable (C),
-void)
+template <typename C, typename V,
+	  hb_enable_if (hb_is_iterable (C))>
+inline void
 hb_fill (C& c, const V &v)
 {
   for (typename C::iter_t i (c); i; i++)
     hb_assign (*i, v);
 }
 
-template <typename S, typename D> inline
-  hb_enable_if_t (hb_is_iterator (S) && hb_is_iterator (D),
-bool)
+template <typename S, typename D,
+	  hb_enable_if (hb_is_iterator (S) && hb_is_iterator (D))>
+inline bool
 hb_copy (D id, S is)
 {
   for (; id && is; ++id, ++is)
@@ -245,9 +245,9 @@ struct hb_zip_t :
   B b;
 };
 
-template <typename A, typename B> inline
-typename hb_enable_if<hb_is_iterable (A) && hb_is_iterable (B),
-hb_zip_t<typename A::iter_t, typename B::iter_t> >::type
+template <typename A, typename B,
+	  hb_enable_if (hb_is_iterable (A) && hb_is_iterable (B))>
+inline hb_zip_t<typename A::iter_t, typename B::iter_t>
 hb_zip (A& a, B &b)
 { return hb_zip_t<typename A::iter_t, typename B::iter_t> (a.iter (), b.iter ()); }
 
diff --git a/src/hb-meta.hh b/src/hb-meta.hh
index c38ae7b64..a9f9df98b 100644
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
@@ -69,7 +69,6 @@ template<typename T>
 struct hb_enable_if<true, T> { typedef T type; };
 
 #define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr
-#define hb_enable_if_t(Cond, Type) typename hb_enable_if<(Cond), Type>::type
 
 
 /*
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index e4ae43511..8c623b0f0 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -559,10 +559,9 @@ struct ArrayOf
     if (unlikely (!c->extend (*this))) return_trace (false);
     return_trace (true);
   }
-  template <typename Iterator>
-    hb_enable_if_t (hb_is_iterator_of (Iterator, const Type),
-  bool) serialize (hb_serialize_context_t *c,
-		   Iterator items)
+  template <typename Iterator,
+	    hb_enable_if (hb_is_iterator_of (Iterator, const Type))>
+  bool serialize (hb_serialize_context_t *c, Iterator items)
   {
     TRACE_SERIALIZE (this);
     unsigned count = items.len ();
@@ -831,10 +830,9 @@ struct SortedArrayOf : ArrayOf<Type, LenType>
     bool ret = ArrayOf<Type, LenType>::serialize (c, items_len);
     return_trace (ret);
   }
-  template <typename Iterator>
-    hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const Type),
-  bool) serialize (hb_serialize_context_t *c,
-		   Iterator items)
+  template <typename Iterator,
+	    hb_enable_if (hb_is_sorted_iterator_of (Iterator, const Type))>
+  bool serialize (hb_serialize_context_t *c, Iterator items)
   {
     TRACE_SERIALIZE (this);
     bool ret = ArrayOf<Type, LenType>::serialize (c, items);
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index d7ae24e81..0a33449fb 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -825,10 +825,9 @@ struct CoverageFormat1
     return i;
   }
 
-  template <typename Iterator>
-    hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
-  bool) serialize (hb_serialize_context_t *c,
-		   Iterator glyphs)
+  template <typename Iterator,
+	    hb_enable_if (hb_is_sorted_iterator_of (Iterator, const GlyphID))>
+  bool serialize (hb_serialize_context_t *c, Iterator glyphs)
   {
     TRACE_SERIALIZE (this);
     return_trace (glyphArray.serialize (c, glyphs));
@@ -894,10 +893,9 @@ struct CoverageFormat2
 	   NOT_COVERED;
   }
 
-  template <typename Iterator>
-    hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
-  bool) serialize (hb_serialize_context_t *c,
-		   Iterator glyphs)
+  template <typename Iterator,
+	    hb_enable_if (hb_is_sorted_iterator_of (Iterator, const GlyphID))>
+  bool serialize (hb_serialize_context_t *c, Iterator glyphs)
   {
     TRACE_SERIALIZE (this);
     if (unlikely (!c->extend_min (*this))) return_trace (false);
@@ -1051,10 +1049,9 @@ struct Coverage
     }
   }
 
-  template <typename Iterator>
-    hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
-  bool) serialize (hb_serialize_context_t *c,
-		   Iterator glyphs)
+  template <typename Iterator,
+	    hb_enable_if (hb_is_sorted_iterator_of (Iterator, const GlyphID))>
+  bool serialize (hb_serialize_context_t *c, Iterator glyphs)
   {
     TRACE_SERIALIZE (this);
     if (unlikely (!c->extend_min (*this))) return_trace (false);
diff --git a/src/test-iter.cc b/src/test-iter.cc
index e6beb0771..e3b258f9d 100644
--- a/src/test-iter.cc
+++ b/src/test-iter.cc
@@ -65,9 +65,9 @@ struct some_array_t
 };
 
 
-template <typename Iter> static
-  hb_enable_if_t (hb_is_iterator (Iter),
-void)
+template <typename Iter,
+	  hb_enable_if (hb_is_iterator (Iter))>
+static void
 test_iterator (Iter it)
 {
   Iter default_constructed;
@@ -85,9 +85,9 @@ test_iterator (Iter it)
   if (it.is_random_access_iterator) {}
 }
 
-template <typename Iterable> static
-  hb_enable_if_t (hb_is_iterable (Iterable),
-void)
+template <typename Iterable,
+	 hb_enable_if (hb_is_iterable (Iterable))>
+static void
 test_iterable (const Iterable &lst = Null(Iterable))
 {
   // Test that can take iterator from.