diff --git a/ios/Text/AlignmentBaseline.m b/ios/Text/AlignmentBaseline.m
index b28d6f25..b1985c63 100644
--- a/ios/Text/AlignmentBaseline.m
+++ b/ios/Text/AlignmentBaseline.m
@@ -7,10 +7,9 @@ NSString* AlignmentBaselineToString( enum AlignmentBaseline fw )
 
 enum AlignmentBaseline AlignmentBaselineFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = AlignmentBaselineStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(AlignmentBaselineStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:AlignmentBaselineStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/FontStyle.m b/ios/Text/FontStyle.m
index 8c61d9e0..a1c0a2b7 100644
--- a/ios/Text/FontStyle.m
+++ b/ios/Text/FontStyle.m
@@ -7,10 +7,9 @@ NSString* FontStyleToString( enum FontStyle fw )
 
 enum FontStyle FontStyleFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = FontStyleStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(FontStyleStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:FontStyleStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/FontVariantLigatures.m b/ios/Text/FontVariantLigatures.m
index 3d182af5..73c0ac8b 100644
--- a/ios/Text/FontVariantLigatures.m
+++ b/ios/Text/FontVariantLigatures.m
@@ -7,10 +7,9 @@ NSString* FontVariantLigaturesToString( enum FontVariantLigatures fw )
 
 enum FontVariantLigatures FontVariantLigaturesFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = FontVariantLigaturesStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(FontVariantLigaturesStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:FontVariantLigaturesStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/FontWeight.m b/ios/Text/FontWeight.m
index 230f1dc2..3a1e6d76 100644
--- a/ios/Text/FontWeight.m
+++ b/ios/Text/FontWeight.m
@@ -7,10 +7,9 @@ NSString* FontWeightToString( enum FontWeight fw )
 
 enum FontWeight FontWeightFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = FontWeightStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(FontWeightStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:FontWeightStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextAnchor.m b/ios/Text/TextAnchor.m
index 2d97c56f..f295551c 100644
--- a/ios/Text/TextAnchor.m
+++ b/ios/Text/TextAnchor.m
@@ -7,10 +7,9 @@ NSString* TextAnchorToString( enum TextAnchor fw )
 
 enum TextAnchor TextAnchorFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextAnchorStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextAnchorStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextAnchorStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextDecoration.m b/ios/Text/TextDecoration.m
index 67e22536..5bf31361 100644
--- a/ios/Text/TextDecoration.m
+++ b/ios/Text/TextDecoration.m
@@ -7,10 +7,9 @@ NSString* TextDecorationToString( enum TextDecoration fw )
 
 enum TextDecoration TextDecorationFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextDecorationStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextDecorationStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextDecorationStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextLengthAdjust.m b/ios/Text/TextLengthAdjust.m
index 3b29e966..0ad44241 100644
--- a/ios/Text/TextLengthAdjust.m
+++ b/ios/Text/TextLengthAdjust.m
@@ -7,10 +7,9 @@ NSString* TextLengthAdjustToString( enum TextLengthAdjust fw )
 
 enum TextLengthAdjust TextLengthAdjustFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextLengthAdjustStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextLengthAdjustStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextLengthAdjustStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextPathMethod.m b/ios/Text/TextPathMethod.m
index 4a218815..23aef013 100644
--- a/ios/Text/TextPathMethod.m
+++ b/ios/Text/TextPathMethod.m
@@ -7,10 +7,9 @@ NSString* TextPathMethodToString( enum TextPathMethod fw )
 
 enum TextPathMethod TextPathMethodFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextPathMethodStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextPathMethodStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextPathMethodStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextPathMidLine.m b/ios/Text/TextPathMidLine.m
index 13e26ace..6e4d3e43 100644
--- a/ios/Text/TextPathMidLine.m
+++ b/ios/Text/TextPathMidLine.m
@@ -7,10 +7,9 @@ NSString* TextPathMidLineToString( enum TextPathMidLine fw )
 
 enum TextPathMidLine TextPathMidLineFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextPathMidLineStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextPathMidLineStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextPathMidLineStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextPathSide.m b/ios/Text/TextPathSide.m
index 2db7a3e7..d0bcb820 100644
--- a/ios/Text/TextPathSide.m
+++ b/ios/Text/TextPathSide.m
@@ -7,10 +7,9 @@ NSString* TextPathSideToString( enum TextPathSide fw )
 
 enum TextPathSide TextPathSideFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextPathSideStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextPathSideStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextPathSideStrings[i]]) {
             return i;
         }
     }
diff --git a/ios/Text/TextPathSpacing.m b/ios/Text/TextPathSpacing.m
index b62139ee..08735d76 100644
--- a/ios/Text/TextPathSpacing.m
+++ b/ios/Text/TextPathSpacing.m
@@ -7,10 +7,9 @@ NSString* TextPathSpacingToString( enum TextPathSpacing fw )
 
 enum TextPathSpacing TextPathSpacingFromString( NSString* s )
 {
-    NSInteger i;
-    NSString* fw;
-    for (i = 0; fw = TextPathSpacingStrings[i], fw != nil; i++) {
-        if ([fw isEqualToString:s]) {
+    const NSUInteger l = sizeof(TextPathSpacingStrings) / sizeof(NSString*);
+    for (NSUInteger i = 0; i < l; i++) {
+        if ([s isEqualToString:TextPathSpacingStrings[i]]) {
             return i;
         }
     }