diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
index e2436a226a..76ff50e447 100644
--- a/objectivec/GPBMessage.m
+++ b/objectivec/GPBMessage.m
@@ -2378,7 +2378,7 @@ static void MergeRepeatedPackedFieldFromCodedInputStream(GPBMessage *self,
         break;
       }
     }  // switch
-  }    // while(BytesUntilLimit() > 0)
+  }  // while(BytesUntilLimit() > 0)
   GPBCodedInputStreamPopLimit(state, limit);
 }
 
@@ -2657,7 +2657,7 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
         }
       }
     }  // if (fieldType)..else if...else
-  }    // for(fields)
+  }  // for(fields)
 
   // Unknown fields.
   if (!unknownFields_) {
@@ -2825,8 +2825,8 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
           break;
         }
       }  // switch()
-    }    // if(mapOrArray)...else
-  }      // for(fields)
+    }  // if(mapOrArray)...else
+  }  // for(fields)
 
   // nil and empty are equal
   if (extensionMap_.count != 0 || otherMsg->extensionMap_.count != 0) {
diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m
index 41360dce71..8bde2dd63e 100644
--- a/objectivec/GPBUtilities.m
+++ b/objectivec/GPBUtilities.m
@@ -149,8 +149,8 @@ void GPBMessageDropUnknownFieldsRecursively(GPBMessage *initialMessage) {
           }
           break;
         }  // switch(field.mapKeyDataType)
-      }    // switch(field.fieldType)
-    }      // for(fields)
+      }  // switch(field.fieldType)
+    }  // for(fields)
 
     // Handle any extensions holding messages.
     for (GPBExtensionDescriptor *extension in [msg extensionsCurrentlySet]) {
diff --git a/objectivec/Tests/GPBConcurrencyTests.m b/objectivec/Tests/GPBConcurrencyTests.m
index a1870ca93e..d585c3f7f1 100644
--- a/objectivec/Tests/GPBConcurrencyTests.m
+++ b/objectivec/Tests/GPBConcurrencyTests.m
@@ -49,8 +49,7 @@ static const int kNumMessages = 100;
 
 - (void)joinThreads:(NSArray *)threads {
   for (NSThread *thread in threads) {
-    while (![thread isFinished])
-      ;
+    while (![thread isFinished]);
   }
 }