diff --git a/src/EFCore/Infrastructure/AccessorExtensions.cs b/src/EFCore/Infrastructure/AccessorExtensions.cs
index 9a26c0a111b..80cf3055e64 100644
--- a/src/EFCore/Infrastructure/AccessorExtensions.cs
+++ b/src/EFCore/Infrastructure/AccessorExtensions.cs
@@ -59,7 +59,7 @@ public static TService GetService<TService>(this IInfrastructure<IServiceProvide
     /// <returns>The requested service.</returns>
     [DebuggerStepThrough]
     public static object GetService(this IInfrastructure<IServiceProvider> accessor, Type serviceType)
-        => InfrastructureExtensions.GetService(serviceType, accessor);
+        => InfrastructureExtensions.GetService(accessor, serviceType);
 
     /// <summary>
     ///     <para>
diff --git a/src/EFCore/Infrastructure/Internal/InfrastructureExtensions.cs b/src/EFCore/Infrastructure/Internal/InfrastructureExtensions.cs
index 54de4072cd1..b593c915ee6 100644
--- a/src/EFCore/Infrastructure/Internal/InfrastructureExtensions.cs
+++ b/src/EFCore/Infrastructure/Internal/InfrastructureExtensions.cs
@@ -21,7 +21,7 @@ public static class InfrastructureExtensions
     /// </summary>
     public static TService GetService<TService>(IInfrastructure<IServiceProvider> accessor)
         where TService : class
-        => (TService)GetService(typeof(TService), accessor);
+        => (TService)GetService(accessor, typeof(TService));
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -29,7 +29,7 @@ public static TService GetService<TService>(IInfrastructure<IServiceProvider> ac
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public static object GetService(Type serviceType, IInfrastructure<IServiceProvider> accessor)
+    public static object GetService(IInfrastructure<IServiceProvider> accessor, Type serviceType)
     {
         var internalServiceProvider = accessor.Instance;
 
diff --git a/src/EFCore/Metadata/IReadOnlyNavigationBase.cs b/src/EFCore/Metadata/IReadOnlyNavigationBase.cs
index b8cbc006fcd..733c8766e66 100644
--- a/src/EFCore/Metadata/IReadOnlyNavigationBase.cs
+++ b/src/EFCore/Metadata/IReadOnlyNavigationBase.cs
@@ -52,7 +52,6 @@ bool LazyLoadingEnabled
         => (bool?)this[CoreAnnotationNames.LazyLoadingEnabled] ?? true;
 
     /// <inheritdoc />
-    // TODO: Remove when #3864 is implemented
     bool IReadOnlyPropertyBase.IsShadowProperty()
         => this.GetIdentifyingMemberInfo() == null;
 }