Merge pull request #8089 from acozzette/fixes Fixed some minor issues

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index f9795e1..a138098 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml

@@ -13,4 +13,4 @@
         with:
           check_filenames: true
           skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal
-          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od"
+          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od"

diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
index 20ae9ae..ee94dee 100644
--- a/objectivec/GPBMessage.m
+++ b/objectivec/GPBMessage.m

@@ -82,7 +82,7 @@
   GPBExtensionDescriptor *autocreatorExtension_;
 
   // Message can only be mutated from one thread. But some *readonly* operations
-  // modifify internal state because they autocreate things. The
+  // modify internal state because they autocreate things. The
   // autocreatedExtensionMap_ is one such structure. Access during readonly
   // operations is protected via this semaphore.
   // NOTE: OSSpinLock may seem like a good fit here but Apple engineers have

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_generator.cc b/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
index c02e377..f41bf63 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_generator.cc

@@ -35,6 +35,7 @@
 #include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream.h>
+#include <google/protobuf/stubs/strutil.h>
 
 namespace google {
 namespace protobuf {

diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc
index d5cdee3..6ac748c 100644
--- a/src/google/protobuf/compiler/php/php_generator.cc
+++ b/src/google/protobuf/compiler/php/php_generator.cc

@@ -2255,7 +2255,7 @@
     if (HasPrefixString(option_pair[0], "aggregate_metadata")) {
       options.aggregate_metadata = true;
       for (const auto& prefix : Split(option_pair[1], "#", false)) {
-        options.aggregate_metadata_prefixes.insert(prefix);
+        options.aggregate_metadata_prefixes.emplace(prefix);
         GOOGLE_LOG(INFO) << prefix;
       }
     } else if (option_pair[0] == "internal") {