diff --git a/src/hb-number-parser.hh b/src/hb-number-parser.hh
index 1a9dbba6d..ec68c3a72 100644
--- a/src/hb-number-parser.hh
+++ b/src/hb-number-parser.hh
@@ -31,7 +31,7 @@
 #include "hb.hh"
 
 
-#line 35 "hb-number-parser.hh"
+#line 32 "hb-number-parser.hh"
 static const unsigned char _double_parser_trans_keys[] = {
 	0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u, 
 	46u, 101u, 0
@@ -135,12 +135,12 @@ strtod_rl (const char *p, const char **end_ptr /* IN/OUT */)
 
   int cs;
   
-#line 139 "hb-number-parser.hh"
+#line 132 "hb-number-parser.hh"
 	{
 	cs = double_parser_start;
 	}
 
-#line 144 "hb-number-parser.hh"
+#line 135 "hb-number-parser.hh"
 	{
 	int _slen;
 	int _trans;
@@ -198,7 +198,7 @@ _resume:
 	  exp_overflow = true;
 }
 	break;
-#line 202 "hb-number-parser.hh"
+#line 187 "hb-number-parser.hh"
 	}
 
 _again:
diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 3797405a6..faca98400 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -963,21 +963,22 @@ struct subr_subsetter_t
     if (!str.has_calls ())
       return;
 
-    auto *value = str.values.arrayZ;
-    auto *end = value + str.values.length;
-    for (; value < end; value++)
+    auto *values = str.values.arrayZ;
+    unsigned count = str.values.length;
+    for (unsigned i = 0; i < count; i++)
     {
-      if (!value->for_drop ())
+      auto &value = values[i];
+      if (!value.for_drop ())
       {
-	switch (value->op)
+	switch (value.op)
 	{
 	  case OpCode_callsubr:
-	    collect_subr_refs_in_subr (value->subr_num, *param.parsed_local_subrs,
+	    collect_subr_refs_in_subr (value.subr_num, *param.parsed_local_subrs,
 				       param.local_closure, param);
 	    break;
 
 	  case OpCode_callgsubr:
-	    collect_subr_refs_in_subr (value->subr_num, *param.parsed_global_subrs,
+	    collect_subr_refs_in_subr (value.subr_num, *param.parsed_global_subrs,
 				       param.global_closure, param);
 	    break;