diff --git a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
deleted file mode 100644
index 208ce1fcb6..0000000000
--- a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-#endregion
-
-namespace Google.Protobuf.Reflection;
-
-internal sealed partial class FeatureSetDescriptor
-{
-    // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
-    private const string DefaultsBase64 =
-        "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
-}
diff --git a/hpb/extension.h b/hpb/extension.h
index 57c75970bd..f561dfcaf0 100644
--- a/hpb/extension.h
+++ b/hpb/extension.h
@@ -300,8 +300,8 @@ decltype(auto) GetExtension(
 
 template <typename T, typename Extension>
 constexpr uint32_t ExtensionNumber(
-    ::hpb::internal::ExtensionIdentifier<T, Extension> id) {
-  return ::hpb::internal::PrivateAccess::GetExtensionNumber(id);
+    const internal::ExtensionIdentifier<T, Extension>& id) {
+  return internal::PrivateAccess::GetExtensionNumber(id);
 }
 
 }  // namespace hpb