From 751ab52783744679da89df310903149146a82ee6 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Wed, 22 Nov 2023 08:48:21 +0000
Subject: [PATCH] Option 2 Fix For #3644

---
 ...valTests.ReactiveUI.DotNet6_0.verified.txt |  26 +---
 ...valTests.ReactiveUI.DotNet7_0.verified.txt |  26 +---
 ...provalTests.ReactiveUI.Net4_7.verified.txt |  26 +---
 .../Bindings/Command/CommandBinder.cs         | 118 +----------------
 .../Command/CommandBinderImplementation.cs    | 119 ------------------
 .../CommandBinderImplementationMixins.cs      |  39 +-----
 .../Command/ICommandBinderImplementation.cs   |  54 +-------
 7 files changed, 15 insertions(+), 393 deletions(-)

diff --git a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt
index 428d21b6ba..63c4473be6 100644
--- a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt
+++ b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt
@@ -81,26 +81,14 @@ namespace ReactiveUI
     public static class CommandBinder
     {
         public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
@@ -109,18 +97,10 @@ namespace ReactiveUI
     {
         public CommandBinderImplementation() { }
         public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
diff --git a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet7_0.verified.txt b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet7_0.verified.txt
index a0cc917fca..89ea095473 100644
--- a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet7_0.verified.txt
+++ b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.DotNet7_0.verified.txt
@@ -81,26 +81,14 @@ namespace ReactiveUI
     public static class CommandBinder
     {
         public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
@@ -109,18 +97,10 @@ namespace ReactiveUI
     {
         public CommandBinderImplementation() { }
         public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
diff --git a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt
index 2e8f3eef9a..a08268e9a0 100644
--- a/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt
+++ b/src/ReactiveUI.Tests/Utilities/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt
@@ -79,26 +79,14 @@ namespace ReactiveUI
     public static class CommandBinder
     {
         public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public static ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> propertyName, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlName, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
@@ -107,18 +95,10 @@ namespace ReactiveUI
     {
         public CommandBinderImplementation() { }
         public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
-            where TView :  class, ReactiveUI.IViewFor<TViewModel>
-            where TViewModel :  class
-            where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.IObservable<TParam?> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
-        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
+        public ReactiveUI.IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp?>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TControl>> controlProperty, System.Linq.Expressions.Expression<System.Func<TViewModel, TParam?>> withParameter, string? toEvent = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class
             where TProp : System.Windows.Input.ICommand { }
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinder.cs b/src/ReactiveUI/Bindings/Command/CommandBinder.cs
index 915eb084be..9d278a66fc 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinder.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinder.cs
@@ -44,39 +44,6 @@ static CommandBinder()
     /// NOTE: If this parameter is used inside WhenActivated, it's
     /// important to dispose the binding when the view is deactivated.</param>
     public static IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        this TView view,
-        TViewModel? viewModel,
-        Expression<Func<TViewModel, TProp?>> propertyName,
-        Expression<Func<TView, TControl>> controlName,
-        IObservable<TParam?> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand =>
-        _binderImplementation.BindCommand(viewModel, view, propertyName, controlName, withParameter, toEvent);
-
-    /// <summary>
-    /// Bind a command from the ViewModel to an explicitly specified control
-    /// on the View.
-    /// </summary>
-    /// <typeparam name="TView">The view type.</typeparam>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    /// <typeparam name="TProp">The property type.</typeparam>
-    /// <typeparam name="TControl">The control type.</typeparam>
-    /// <typeparam name="TParam">The parameter type.</typeparam>
-    /// <returns>A class representing the binding. Dispose it to disconnect
-    /// the binding.</returns>
-    /// <param name="view">The View.</param>
-    /// <param name="viewModel">The View model.</param>
-    /// <param name="propertyName">The ViewModel command to bind.</param>
-    /// <param name="controlName">The name of the control on the view.</param>
-    /// <param name="withParameter">The ViewModel property to pass as the
-    /// param of the ICommand.</param>
-    /// <param name="toEvent">If specified, bind to the specific event
-    /// instead of the default.
-    /// NOTE: If this parameter is used inside WhenActivated, it's
-    /// important to dispose the binding when the view is deactivated.</param>
-    public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         this TView view,
         TViewModel? viewModel,
         Expression<Func<TViewModel, TProp?>> propertyName,
@@ -86,7 +53,7 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
         where TView : class, IViewFor
         where TViewModel : class
         where TProp : ICommand =>
-        _binderImplementation.BindCommandNonGeneric(viewModel, view, propertyName, controlName, withParameter, toEvent);
+        _binderImplementation.BindCommand(viewModel, view, propertyName, controlName, withParameter, toEvent);
 
     /// <summary>
     /// Bind a command from the ViewModel to an explicitly specified control
@@ -107,35 +74,6 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
     /// NOTE: If this parameter is used inside WhenActivated, it's
     /// important to dispose the binding when the view is deactivated.</param>
     public static IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl>(
-        this TView view,
-        TViewModel? viewModel,
-        Expression<Func<TViewModel, TProp?>> propertyName,
-        Expression<Func<TView, TControl>> controlName,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand =>
-        _binderImplementation.BindCommand(viewModel, view, propertyName, controlName, toEvent);
-
-    /// <summary>
-    /// Bind a command from the ViewModel to an explicitly specified control
-    /// on the View.
-    /// </summary>
-    /// <typeparam name="TView">The view type.</typeparam>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    /// <typeparam name="TProp">The property type.</typeparam>
-    /// <typeparam name="TControl">The control type.</typeparam>
-    /// <returns>A class representing the binding. Dispose it to disconnect
-    /// the binding.</returns>
-    /// <param name="view">The View.</param>
-    /// <param name="viewModel">The View model.</param>
-    /// <param name="propertyName">The ViewModel command to bind.</param>
-    /// <param name="controlName">The name of the control on the view.</param>
-    /// <param name="toEvent">If specified, bind to the specific event
-    /// instead of the default.
-    /// NOTE: If this parameter is used inside WhenActivated, it's
-    /// important to dispose the binding when the view is deactivated.</param>
-    public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl>(
         this TView view,
         TViewModel? viewModel,
         Expression<Func<TViewModel, TProp?>> propertyName,
@@ -144,7 +82,7 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
         where TView : class, IViewFor
         where TViewModel : class
         where TProp : ICommand =>
-        _binderImplementation.BindCommandNonGeneric(viewModel, view, propertyName, controlName, toEvent);
+        _binderImplementation.BindCommand(viewModel, view, propertyName, controlName, toEvent);
 
     /// <summary>
     /// Bind a command from the ViewModel to an explicitly specified control
@@ -168,56 +106,6 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
     /// NOTE: If this parameter is used inside WhenActivated, it's
     /// important to dispose the binding when the view is deactivated.</param>
     public static IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        this TView view,
-        TViewModel? viewModel,
-        Expression<Func<TViewModel, TProp?>> propertyName,
-        Expression<Func<TView, TControl>> controlName,
-        Expression<Func<TViewModel, TParam?>> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand
-    {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(view);
-#else
-        if (view is null)
-        {
-            throw new ArgumentNullException(nameof(view));
-        }
-#endif
-
-        return _binderImplementation.BindCommand(
-                                                 viewModel,
-                                                 view,
-                                                 propertyName,
-                                                 controlName,
-                                                 withParameter,
-                                                 toEvent);
-    }
-
-    /// <summary>
-    /// Bind a command from the ViewModel to an explicitly specified control
-    /// on the View.
-    /// </summary>
-    /// <typeparam name="TView">The view type.</typeparam>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    /// <typeparam name="TProp">The property type.</typeparam>
-    /// <typeparam name="TControl">The control type.</typeparam>
-    /// <typeparam name="TParam">The parameter type.</typeparam>
-    /// <returns>A class representing the binding. Dispose it to disconnect
-    /// the binding.</returns>
-    /// <param name="view">The View.</param>
-    /// <param name="viewModel">The View model.</param>
-    /// <param name="propertyName">The ViewModel command to bind.</param>
-    /// <param name="controlName">The name of the control on the view.</param>
-    /// <param name="withParameter">The ViewModel property to pass as the
-    /// param of the ICommand.</param>
-    /// <param name="toEvent">If specified, bind to the specific event
-    /// instead of the default.
-    /// NOTE: If this parameter is used inside WhenActivated, it's
-    /// important to dispose the binding when the view is deactivated.</param>
-    public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         this TView view,
         TViewModel? viewModel,
         Expression<Func<TViewModel, TProp?>> propertyName,
@@ -237,7 +125,7 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
         }
 #endif
 
-        return _binderImplementation.BindCommandNonGeneric(
+        return _binderImplementation.BindCommand(
                                                  viewModel,
                                                  view,
                                                  propertyName,
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs b/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
index 64f1aec08f..43ab0692bc 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
@@ -39,68 +39,6 @@ public class CommandBinderImplementation : ICommandBinderImplementation
     /// or
     /// nameof(vmProperty).</exception>
     public IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> vmProperty,
-        Expression<Func<TView, TControl>> controlProperty,
-        Expression<Func<TViewModel, TParam?>> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand
-    {
-        if (vmProperty is null)
-        {
-            throw new ArgumentNullException(nameof(vmProperty));
-        }
-
-        if (controlProperty is null)
-        {
-            throw new ArgumentNullException(nameof(controlProperty));
-        }
-
-        var vmExpression = Reflection.Rewrite(vmProperty.Body);
-        var controlExpression = Reflection.Rewrite(controlProperty.Body);
-        var source = Reflection.ViewModelWhenAnyValue(viewModel, view, vmExpression).Cast<TProp>();
-
-        var bindingDisposable = BindCommandInternal(source, view, controlExpression, withParameter.ToObservable(viewModel), toEvent);
-
-        return new ReactiveBinding<TView, TProp>(
-                                                 view,
-                                                 controlExpression,
-                                                 vmExpression,
-                                                 source,
-                                                 BindingDirection.OneWay,
-                                                 bindingDisposable);
-    }
-
-    /// <summary>
-    /// Bind a command from the ViewModel to an explicitly specified control
-    /// on the View.
-    /// </summary>
-    /// <typeparam name="TView">The view type.</typeparam>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    /// <typeparam name="TProp">The property type.</typeparam>
-    /// <typeparam name="TControl">The control type.</typeparam>
-    /// <typeparam name="TParam">The parameter type.</typeparam>
-    /// <param name="viewModel">The View model.</param>
-    /// <param name="view">The View.</param>
-    /// <param name="vmProperty">The ViewModel command to bind.</param>
-    /// <param name="controlProperty">The name of the control on the view.</param>
-    /// <param name="withParameter">The ViewModel property to pass as the
-    /// param of the ICommand.</param>
-    /// <param name="toEvent">If specified, bind to the specific event
-    /// instead of the default.
-    /// NOTE: If this parameter is used inside WhenActivated, it's
-    /// important to dispose the binding when the view is deactivated.</param>
-    /// <returns>
-    /// A class representing the binding. Dispose it to disconnect
-    /// the binding.
-    /// </returns>
-    /// <exception cref="ArgumentNullException">nameof(vmProperty)
-    /// or
-    /// nameof(vmProperty).</exception>
-    public IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         TViewModel? viewModel,
         TView view,
         Expression<Func<TViewModel, TProp?>> vmProperty,
@@ -158,63 +96,6 @@ public IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, T
     /// NOTE: If this parameter is used inside WhenActivated, it's
     /// important to dispose the binding when the view is deactivated.</param>
     public IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> vmProperty,
-        Expression<Func<TView, TControl>> controlProperty,
-        IObservable<TParam?> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand
-    {
-        if (vmProperty is null)
-        {
-            throw new ArgumentNullException(nameof(vmProperty));
-        }
-
-        if (controlProperty is null)
-        {
-            throw new ArgumentNullException(nameof(controlProperty));
-        }
-
-        var vmExpression = Reflection.Rewrite(vmProperty.Body);
-        var controlExpression = Reflection.Rewrite(controlProperty.Body);
-        var source = Reflection.ViewModelWhenAnyValue(viewModel, view, vmExpression).Cast<TProp>();
-
-        var bindingDisposable = BindCommandInternal(source, view, controlExpression, withParameter, toEvent);
-
-        return new ReactiveBinding<TView, TProp>(
-                                                 view,
-                                                 controlExpression,
-                                                 vmExpression,
-                                                 source,
-                                                 BindingDirection.OneWay,
-                                                 bindingDisposable);
-    }
-
-    /// <summary>
-    /// Bind a command from the ViewModel to an explicitly specified control
-    /// on the View.
-    /// </summary>
-    /// <typeparam name="TView">The view type.</typeparam>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    /// <typeparam name="TProp">The property type.</typeparam>
-    /// <typeparam name="TControl">The control type.</typeparam>
-    /// <typeparam name="TParam">The parameter type.</typeparam>
-    /// <returns>A class representing the binding. Dispose it to disconnect
-    /// the binding.</returns>
-    /// <param name="viewModel">The View model.</param>
-    /// <param name="view">The View.</param>
-    /// <param name="vmProperty">The ViewModel command to bind.</param>
-    /// <param name="controlProperty">The name of the control on the view.</param>
-    /// <param name="withParameter">The ViewModel property to pass as the
-    /// param of the ICommand.</param>
-    /// <param name="toEvent">If specified, bind to the specific event
-    /// instead of the default.
-    /// NOTE: If this parameter is used inside WhenActivated, it's
-    /// important to dispose the binding when the view is deactivated.</param>
-    public IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         TViewModel? viewModel,
         TView view,
         Expression<Func<TViewModel, TProp?>> vmProperty,
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs b/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs
index 1ad482159f..5223efea68 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs
@@ -19,47 +19,12 @@ public static IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TPro
         Expression<Func<TViewModel, TProp?>> propertyName,
         Expression<Func<TView, TControl>> controlName,
         string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
+        where TView : class, IViewFor
         where TViewModel : class
         where TProp : ICommand =>
         @this.BindCommand(viewModel, view, propertyName, controlName, Observable<object>.Empty, toEvent);
 
     public static IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        this ICommandBinderImplementation @this,
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> propertyName,
-        Expression<Func<TView, TControl>> controlName,
-        Expression<Func<TViewModel, TParam>> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand
-    {
-        if (withParameter is null)
-        {
-            throw new ArgumentNullException(nameof(withParameter));
-        }
-
-        var paramExpression = Reflection.Rewrite(withParameter.Body);
-        var param = Reflection.ViewModelWhenAnyValue(viewModel, view, paramExpression);
-
-        return @this.BindCommand(viewModel, view, propertyName, controlName, param, toEvent);
-    }
-
-    public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl>(
-        this ICommandBinderImplementation @this,
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> propertyName,
-        Expression<Func<TView, TControl>> controlName,
-        string? toEvent = null)
-        where TView : class, IViewFor
-        where TViewModel : class
-        where TProp : ICommand =>
-        @this.BindCommandNonGeneric(viewModel, view, propertyName, controlName, Observable<object>.Empty, toEvent);
-
-    public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         this ICommandBinderImplementation @this,
         TViewModel? viewModel,
         TView view,
@@ -79,6 +44,6 @@ public static IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewM
         var paramExpression = Reflection.Rewrite(withParameter.Body);
         var param = Reflection.ViewModelWhenAnyValue(viewModel, view, paramExpression);
 
-        return @this.BindCommandNonGeneric(viewModel, view, propertyName, controlName, param, toEvent);
+        return @this.BindCommand(viewModel, view, propertyName, controlName, param, toEvent);
     }
 }
diff --git a/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs b/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
index d309d10688..db1c8f074d 100644
--- a/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
@@ -28,58 +28,6 @@ internal interface ICommandBinderImplementation : IEnableLogger
     /// <typeparam name="TParam">The type of the parameter to pass to the ICommand.</typeparam>
     /// <returns>A reactive binding. Often only used for disposing the binding.</returns>
     IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> vmProperty,
-        Expression<Func<TView, TControl>> controlProperty,
-        Expression<Func<TViewModel, TParam?>> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand;
-
-    /// <summary>
-    /// Binds the command on a ViewModel to a control on the View.
-    /// </summary>
-    /// <param name="viewModel">The view model to bind to.</param>
-    /// <param name="view">The view to bind to.</param>
-    /// <param name="vmProperty">The name of the property on the View Model.</param>
-    /// <param name="controlProperty">The name of the control on the View.</param>
-    /// <param name="withParameter">A observable if we want to pass a parameter to the ICommand.</param>
-    /// <param name="toEvent">A event on the view that will also trigger the command.</param>
-    /// <typeparam name="TView">The type of the view.</typeparam>
-    /// <typeparam name="TViewModel">The type of the view model.</typeparam>
-    /// <typeparam name="TProp">The type of the property on the view model.</typeparam>
-    /// <typeparam name="TControl">The type of control on the view.</typeparam>
-    /// <typeparam name="TParam">The type of the parameter to pass to the ICommand.</typeparam>
-    /// <returns>A reactive binding. Often only used for disposing the binding.</returns>
-    IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
-        TViewModel? viewModel,
-        TView view,
-        Expression<Func<TViewModel, TProp?>> vmProperty,
-        Expression<Func<TView, TControl>> controlProperty,
-        IObservable<TParam?> withParameter,
-        string? toEvent = null)
-        where TView : class, IViewFor<TViewModel>
-        where TViewModel : class
-        where TProp : ICommand;
-
-    /// <summary>
-    /// Binds the command on a ViewModel to a control on the View.
-    /// </summary>
-    /// <param name="viewModel">The view model to bind to.</param>
-    /// <param name="view">The view to bind to.</param>
-    /// <param name="vmProperty">The name of the property on the View Model.</param>
-    /// <param name="controlProperty">The name of the control on the View.</param>
-    /// <param name="withParameter">A function if we want to pass a parameter to the ICommand.</param>
-    /// <param name="toEvent">A event on the view that will also trigger the command.</param>
-    /// <typeparam name="TView">The type of the view.</typeparam>
-    /// <typeparam name="TViewModel">The type of the view model.</typeparam>
-    /// <typeparam name="TProp">The type of the property on the view model.</typeparam>
-    /// <typeparam name="TControl">The type of control on the view.</typeparam>
-    /// <typeparam name="TParam">The type of the parameter to pass to the ICommand.</typeparam>
-    /// <returns>A reactive binding. Often only used for disposing the binding.</returns>
-    IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
         TViewModel? viewModel,
         TView view,
         Expression<Func<TViewModel, TProp?>> vmProperty,
@@ -105,7 +53,7 @@ IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, T
     /// <typeparam name="TControl">The type of control on the view.</typeparam>
     /// <typeparam name="TParam">The type of the parameter to pass to the ICommand.</typeparam>
     /// <returns>A reactive binding. Often only used for disposing the binding.</returns>
-    IReactiveBinding<TView, TProp> BindCommandNonGeneric<TView, TViewModel, TProp, TControl, TParam>(
+    IReactiveBinding<TView, TProp> BindCommand<TView, TViewModel, TProp, TControl, TParam>(
         TViewModel? viewModel,
         TView view,
         Expression<Func<TViewModel, TProp?>> vmProperty,