diff --git a/src/hb-iter-private.hh b/src/hb-iter-private.hh
index a22675cd7..410a50f94 100644
--- a/src/hb-iter-private.hh
+++ b/src/hb-iter-private.hh
@@ -50,11 +50,13 @@
 template <typename T>
 struct Iter;
 
+#if 0
 template <typename T>
 struct Iter
 {
-  inline Iter (const T &c);
+  explicit inline Iter (const T &c);
 };
+#endif
 
 template <typename T>
 struct Iter<T *>
@@ -66,7 +68,7 @@ struct Iter<T *>
   inline Iter (T *array_, int length_) :
     array (array_), length (MAX (length_, 0)) {}
   template <unsigned int length_>
-  inline Iter (T (&array_)[length_]) :
+  explicit inline Iter (T (&array_)[length_]) :
     array (array_), length (length_) {}
 
   /* Emptiness. */
@@ -138,7 +140,7 @@ m (void)
 
   s2 = s;
 
-  for (; s && t; s++, t++)
+  for (; s && t; ++s, ++t)
    {
     *t = *s;
    }
diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index 649788c16..653d7c6f2 100644
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -400,7 +400,6 @@ struct hb_serialize_context_t
 		     this->start, this->end,
 		     (int) (this->head - this->start),
 		     this->ran_out_of_room ? "RAN OUT OF ROOM" : "did not ran out of room");
-
   }
 
   template <typename Type>