diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index 006af2f961..5f7fff638f 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -623,9 +623,9 @@ void Api::InternalSwap(Api* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_methods()->InternalSwap(other->_internal_mutable_methods());
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
-  _internal_mutable_mixins()->InternalSwap(other->_internal_mutable_mixins());
+  _impl_.methods_.InternalSwap(&other->_impl_.methods_);
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
+  _impl_.mixins_.InternalSwap(&other->_impl_.mixins_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.version_, lhs_arena,
@@ -1008,7 +1008,7 @@ void Method::InternalSwap(Method* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.request_type_url_, lhs_arena,
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index fc05d27647..b923b97b13 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1147,7 +1147,7 @@ inline ::google::protobuf::Syntax Api::syntax() const {
   return _internal_syntax();
 }
 inline void Api::set_syntax(::google::protobuf::Syntax value) {
-   _internal_set_syntax(value);
+  _internal_set_syntax(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Api.syntax)
 }
 inline ::google::protobuf::Syntax Api::_internal_syntax() const {
@@ -1413,7 +1413,7 @@ inline ::google::protobuf::Syntax Method::syntax() const {
   return _internal_syntax();
 }
 inline void Method::set_syntax(::google::protobuf::Syntax value) {
-   _internal_set_syntax(value);
+  _internal_set_syntax(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Method.syntax)
 }
 inline ::google::protobuf::Syntax Method::_internal_syntax() const {
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index 7ce27de011..d64c979591 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -279,8 +279,7 @@ PROTOBUF_NOINLINE bool FieldMask::IsInitialized() const {
 void FieldMask::InternalSwap(FieldMask* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_paths()->InternalSwap(
-      other->_internal_mutable_paths());
+  _impl_.paths_.InternalSwap(&other->_impl_.paths_);
 }
 
 ::google::protobuf::Metadata FieldMask::GetMetadata() const {
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 5170ce0352..5d214b45ae 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -992,7 +992,7 @@ PROTOBUF_NOINLINE bool ListValue::IsInitialized() const {
 void ListValue::InternalSwap(ListValue* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_values()->InternalSwap(other->_internal_mutable_values());
+  _impl_.values_.InternalSwap(&other->_impl_.values_);
 }
 
 ::google::protobuf::Metadata ListValue::GetMetadata() const {
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 8b705f56c8..5aecc6e3f6 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -820,7 +820,7 @@ inline ::google::protobuf::NullValue Value::null_value() const {
   return _internal_null_value();
 }
 inline void Value::set_null_value(::google::protobuf::NullValue value) {
-   _internal_set_null_value(value);
+  _internal_set_null_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Value.null_value)
 }
 inline ::google::protobuf::NullValue Value::_internal_null_value() const {
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 1b38eb4b29..378625d940 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -835,10 +835,9 @@ void Type::InternalSwap(Type* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_fields()->InternalSwap(other->_internal_mutable_fields());
-  _internal_mutable_oneofs()->InternalSwap(
-      other->_internal_mutable_oneofs());
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.fields_.InternalSwap(&other->_impl_.fields_);
+  _impl_.oneofs_.InternalSwap(&other->_impl_.oneofs_);
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
@@ -1311,7 +1310,7 @@ void Field::InternalSwap(Field* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, lhs_arena,
@@ -1689,8 +1688,8 @@ void Enum::InternalSwap(Enum* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_enumvalue()->InternalSwap(other->_internal_mutable_enumvalue());
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.enumvalue_.InternalSwap(&other->_impl_.enumvalue_);
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
@@ -1942,7 +1941,7 @@ void EnumValue::InternalSwap(EnumValue* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
         swap(_impl_.number_, other->_impl_.number_);
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 3f98bd12f0..5143cae575 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1835,7 +1835,7 @@ inline ::google::protobuf::Syntax Type::syntax() const {
   return _internal_syntax();
 }
 inline void Type::set_syntax(::google::protobuf::Syntax value) {
-   _internal_set_syntax(value);
+  _internal_set_syntax(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Type.syntax)
 }
 inline ::google::protobuf::Syntax Type::_internal_syntax() const {
@@ -1912,7 +1912,7 @@ inline ::google::protobuf::Field_Kind Field::kind() const {
   return _internal_kind();
 }
 inline void Field::set_kind(::google::protobuf::Field_Kind value) {
-   _internal_set_kind(value);
+  _internal_set_kind(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Field.kind)
 }
 inline ::google::protobuf::Field_Kind Field::_internal_kind() const {
@@ -1934,7 +1934,7 @@ inline ::google::protobuf::Field_Cardinality Field::cardinality() const {
   return _internal_cardinality();
 }
 inline void Field::set_cardinality(::google::protobuf::Field_Cardinality value) {
-   _internal_set_cardinality(value);
+  _internal_set_cardinality(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Field.cardinality)
 }
 inline ::google::protobuf::Field_Cardinality Field::_internal_cardinality() const {
@@ -2511,7 +2511,7 @@ inline ::google::protobuf::Syntax Enum::syntax() const {
   return _internal_syntax();
 }
 inline void Enum::set_syntax(::google::protobuf::Syntax value) {
-   _internal_set_syntax(value);
+  _internal_set_syntax(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Enum.syntax)
 }
 inline ::google::protobuf::Syntax Enum::_internal_syntax() const {