diff --git a/Source/GSString.m b/Source/GSString.m
index fcad7174d..766f7d839 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -757,7 +757,7 @@ static BOOL useTinyStrings;
 static int tinyStrings = 0;
 static void logTinyStringCount(void)
 {
-	fprintf(stderr, "%d tiny strings created\n", tinyStrings);
+  fprintf(stderr, "%d tiny strings created\n", tinyStrings);
 }
 #endif
 @implementation GSTinyString
@@ -3752,12 +3752,14 @@ agree, create a new GSCInlineString otherwise.
 {
   if (!_flags.wide)
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
+        {
+          return tinyString;
+        }
     }
   if (_flags.owned)
     {
@@ -3776,12 +3778,14 @@ agree, create a new GSCInlineString otherwise.
     }
   if (!_flags.wide)
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
+        {
+          return tinyString;
+        }
     }
   return [super substringWithRange: aRange];
 }
@@ -4087,12 +4091,14 @@ agree, create a new GSCInlineString otherwise.
 {
   if (!_flags.wide)
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
+        {
+          return tinyString;
+        }
     }
   if (_flags.owned)
     {
@@ -4106,12 +4112,14 @@ agree, create a new GSCInlineString otherwise.
 {
   if (!_flags.wide)
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
+        {
+          return tinyString;
+        }
     }
   if (_flags.owned)
     {
@@ -5119,19 +5127,22 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
     }
   else
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
-    }
-    {
-      GSCInlineString *o;
+        {
+          return tinyString;
+        }
+      else
+        {
+          GSCInlineString *o;
 
-      o = [newCInline(aRange.length, [self zone]) autorelease];
-      memcpy(o->_contents.c, _contents.c + aRange.location, aRange.length);
-      return o;
+          o = [newCInline(aRange.length, [self zone]) autorelease];
+          memcpy(o->_contents.c, _contents.c + aRange.location, aRange.length);
+          return o;
+        }
     }
 }
 
@@ -5154,19 +5165,22 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
     }
   else
     {
-      id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
+      id tinyString;
 
+      tinyString = createTinyString((char*)_contents.c + aRange.location,
+        aRange.length);
       if (tinyString)
-      {
-        return tinyString;
-      }
-    }
-    {
-      GSCInlineString *o;
+        {
+          return tinyString;
+        }
+      else
+        {
+          GSCInlineString *o;
 
-      o = [newCInline(aRange.length, [self zone]) autorelease];
-      memcpy(o->_contents.c, _contents.c + aRange.location, aRange.length);
-      return o;
+          o = [newCInline(aRange.length, [self zone]) autorelease];
+          memcpy(o->_contents.c, _contents.c + aRange.location, aRange.length);
+          return o;
+        }
     }
 }