diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
index f118c68a2b8..d24a1c07536 100644
--- a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
+++ b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -1363,9 +1363,16 @@ when methodCallExpression.Method.IsGenericMethod
                     && methodCallExpression.Method.DeclaringType!.IsGenericType
                     && methodCallExpression.Method.DeclaringType.GetGenericTypeDefinition() == typeof(SetPropertyCalls<>):
 
-                    list.Add(
-                        (methodCallExpression.Arguments[0].UnwrapLambdaFromQuote(),
-                            methodCallExpression.Arguments[1].UnwrapLambdaFromQuote()));
+                    var propertyLambda = methodCallExpression.Arguments[0].UnwrapLambdaFromQuote();
+
+                    list.Add((
+                        propertyLambda,
+                        methodCallExpression.Arguments[1] is UnaryExpression { NodeType: ExpressionType.Quote } quoteExpression
+                            ? (LambdaExpression)quoteExpression.Operand
+                            : Expression.Lambda(
+                                methodCallExpression.Arguments[1],
+                                Expression.Parameter(propertyLambda.Parameters[0].Type, propertyLambda.Parameters[0].Name))));
+
                     PopulateSetPropertyCalls(methodCallExpression.Object!, list, parameter);
 
                     break;
diff --git a/src/EFCore.Relational/Query/SetPropertyCalls.cs b/src/EFCore.Relational/Query/SetPropertyCalls.cs
index cbd60a922ef..d29cd7a2f3b 100644
--- a/src/EFCore.Relational/Query/SetPropertyCalls.cs
+++ b/src/EFCore.Relational/Query/SetPropertyCalls.cs
@@ -34,13 +34,29 @@ private SetPropertyCalls()
     /// <param name="valueExpression">A value expression.</param>
     /// <returns>
     ///     The same instance so that multiple calls to
-    ///     <see cref="SetProperty{TProperty}(Expression{Func{TSource, TProperty}}, Expression{Func{TSource, TProperty}})" /> can be chained.
+    ///     <see cref="SetPropertyCalls{TSource}.SetProperty{TProperty}(Expression{Func{TSource, TProperty}}, Expression{Func{TSource, TProperty}})" />
+    ///     can be chained.
     /// </returns>
     public SetPropertyCalls<TSource> SetProperty<TProperty>(
         Expression<Func<TSource, TProperty>> propertyExpression,
         Expression<Func<TSource, TProperty>> valueExpression)
         => throw new InvalidOperationException(RelationalStrings.SetPropertyMethodInvoked);
 
+    /// <summary>
+    ///     Specifies a property and corresponding value it should be updated to in ExecuteUpdate method.
+    /// </summary>
+    /// <typeparam name="TProperty">The type of property.</typeparam>
+    /// <param name="propertyExpression">A property access expression.</param>
+    /// <param name="valueExpression">A value expression.</param>
+    /// <returns>
+    ///     The same instance so that multiple calls to
+    ///     <see cref="SetPropertyCalls{TSource}.SetProperty{TProperty}(Expression{Func{TSource, TProperty}}, TProperty)" /> can be chained.
+    /// </returns>
+    public SetPropertyCalls<TSource> SetProperty<TProperty>(
+        Expression<Func<TSource, TProperty>> propertyExpression,
+        TProperty valueExpression)
+        => throw new InvalidOperationException(RelationalStrings.SetPropertyMethodInvoked);
+
     #region Hidden System.Object members
 
     /// <summary>
diff --git a/test/EFCore.Relational.Specification.Tests/BulkUpdates/FiltersInheritanceBulkUpdatesTestBase.cs b/test/EFCore.Relational.Specification.Tests/BulkUpdates/FiltersInheritanceBulkUpdatesTestBase.cs
index 0752cec0e17..686fb24805d 100644
--- a/test/EFCore.Relational.Specification.Tests/BulkUpdates/FiltersInheritanceBulkUpdatesTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/BulkUpdates/FiltersInheritanceBulkUpdatesTestBase.cs
@@ -102,7 +102,7 @@ public virtual Task Update_where_hierarchy(bool async)
             async,
             ss => ss.Set<Animal>().Where(e => e.Name == "Great spotted kiwi"),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Animal"),
+            s => s.SetProperty(e => e.Name, "Animal"),
             rowsAffectedCount: 1,
             (b, a) => a.ForEach(e => Assert.Equal("Animal", e.Name)));
 
@@ -113,7 +113,7 @@ public virtual Task Update_where_hierarchy_subquery(bool async)
             async,
             ss => ss.Set<Animal>().Where(e => e.Name == "Great spotted kiwi").OrderBy(e => e.Name).Skip(0).Take(3),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Animal"),
+            s => s.SetProperty(e => e.Name, "Animal"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -123,7 +123,7 @@ public virtual Task Update_where_hierarchy_derived(bool async)
             async,
             ss => ss.Set<Kiwi>().Where(e => e.Name == "Great spotted kiwi"),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Kiwi"),
+            s => s.SetProperty(e => e.Name, "Kiwi"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -133,7 +133,7 @@ public virtual Task Update_where_using_hierarchy(bool async)
             async,
             ss => ss.Set<Country>().Where(e => e.Animals.Where(a => a.CountryId > 0).Count() > 0),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Monovia"),
+            s => s.SetProperty(e => e.Name, "Monovia"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -143,7 +143,7 @@ public virtual Task Update_where_using_hierarchy_derived(bool async)
             async,
             ss => ss.Set<Country>().Where(e => e.Animals.OfType<Kiwi>().Where(a => a.CountryId > 0).Count() > 0),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Monovia"),
+            s => s.SetProperty(e => e.Name, "Monovia"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -155,7 +155,7 @@ public virtual Task Update_where_keyless_entity_mapped_to_sql_query(bool async)
                 async,
                 ss => ss.Set<EagleQuery>().Where(e => e.CountryId > 0),
                 e => e,
-                s => s.SetProperty(e => e.Name, e => "Eagle"),
+                s => s.SetProperty(e => e.Name, "Eagle"),
                 rowsAffectedCount: 1));
 
     protected abstract void ClearLog();
diff --git a/test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesTestBase.cs b/test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesTestBase.cs
index f7beaa7aeed..08b871a55d8 100644
--- a/test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/BulkUpdates/InheritanceBulkUpdatesTestBase.cs
@@ -102,7 +102,7 @@ public virtual Task Update_where_hierarchy(bool async)
             async,
             ss => ss.Set<Animal>().Where(e => e.Name == "Great spotted kiwi"),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Animal"),
+            s => s.SetProperty(e => e.Name, "Animal"),
             rowsAffectedCount: 1,
             (b, a) => a.ForEach(e => Assert.Equal("Animal", e.Name)));
 
@@ -113,7 +113,7 @@ public virtual Task Update_where_hierarchy_subquery(bool async)
             async,
             ss => ss.Set<Animal>().Where(e => e.Name == "Great spotted kiwi").OrderBy(e => e.Name).Skip(0).Take(3),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Animal"),
+            s => s.SetProperty(e => e.Name, "Animal"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -123,7 +123,7 @@ public virtual Task Update_where_hierarchy_derived(bool async)
             async,
             ss => ss.Set<Kiwi>().Where(e => e.Name == "Great spotted kiwi"),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Kiwi"),
+            s => s.SetProperty(e => e.Name, "Kiwi"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -133,7 +133,7 @@ public virtual Task Update_where_using_hierarchy(bool async)
             async,
             ss => ss.Set<Country>().Where(e => e.Animals.Where(a => a.CountryId > 0).Count() > 0),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Monovia"),
+            s => s.SetProperty(e => e.Name, "Monovia"),
             rowsAffectedCount: 2);
 
     [ConditionalTheory]
@@ -143,7 +143,7 @@ public virtual Task Update_where_using_hierarchy_derived(bool async)
             async,
             ss => ss.Set<Country>().Where(e => e.Animals.OfType<Kiwi>().Where(a => a.CountryId > 0).Count() > 0),
             e => e,
-            s => s.SetProperty(e => e.Name, e => "Monovia"),
+            s => s.SetProperty(e => e.Name, "Monovia"),
             rowsAffectedCount: 1);
 
     [ConditionalTheory]
@@ -155,7 +155,7 @@ public virtual Task Update_where_keyless_entity_mapped_to_sql_query(bool async)
                 async,
                 ss => ss.Set<EagleQuery>().Where(e => e.CountryId > 0),
                 e => e,
-                s => s.SetProperty(e => e.Name, e => "Eagle"),
+                s => s.SetProperty(e => e.Name, "Eagle"),
                 rowsAffectedCount: 1));
 
     protected abstract void ClearLog();
diff --git a/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs b/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs
index 1d5f6adbdb2..423135eea72 100644
--- a/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/BulkUpdates/NorthwindBulkUpdatesTestBase.cs
@@ -371,7 +371,7 @@ public virtual Task Update_Where_set_constant_TagWith(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).TagWith("MyUpdate"),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -382,7 +382,7 @@ public virtual Task Update_Where_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -390,12 +390,14 @@ public virtual Task Update_Where_set_constant(bool async)
     [MemberData(nameof(IsAsyncData))]
     public virtual async Task Update_Where_parameter_set_constant(bool async)
     {
+        using var context = Fixture.CreateContext();
+
         var customer = "ALFKI";
         await AssertUpdate(
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID == customer),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 1,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -404,7 +406,7 @@ await AssertUpdate(
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID == customer),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 0,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
     }
@@ -418,7 +420,7 @@ public virtual Task Update_Where_set_parameter(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => value),
+            s => s.SetProperty(c => c.ContactName, value),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Abc", c.ContactName)));
     }
@@ -430,7 +432,7 @@ public virtual Task Update_Where_Skip_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).Skip(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -441,7 +443,7 @@ public virtual Task Update_Where_Take_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).Take(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -452,7 +454,7 @@ public virtual Task Update_Where_Skip_Take_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).Skip(2).Take(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -463,7 +465,7 @@ public virtual Task Update_Where_OrderBy_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).OrderBy(c => c.City),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -474,7 +476,7 @@ public virtual Task Update_Where_OrderBy_Skip_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).OrderBy(c => c.City).Skip(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -485,7 +487,7 @@ public virtual Task Update_Where_OrderBy_Take_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).OrderBy(c => c.City).Take(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -496,7 +498,7 @@ public virtual Task Update_Where_OrderBy_Skip_Take_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).OrderBy(c => c.City).Skip(2).Take(4),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 4,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -507,7 +509,7 @@ public virtual Task Update_Where_OrderBy_Skip_Take_Skip_Take_set_constant(bool a
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).OrderBy(c => c.City).Skip(2).Take(6).Skip(2).Take(2),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 2,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -522,7 +524,7 @@ public virtual Task Update_Where_GroupBy_aggregate_set_constant(bool async)
                         == ss.Set<Order>()
                             .GroupBy(e => e.CustomerID).Where(g => g.Count() > 11).Select(e => e.Key).FirstOrDefault()),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 1,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -537,7 +539,7 @@ public virtual Task Update_Where_GroupBy_First_set_constant(bool async)
                         == ss.Set<Order>()
                             .GroupBy(e => e.CustomerID).Where(g => g.Count() > 11).Select(e => e.First().CustomerID).FirstOrDefault()),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 1,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -552,7 +554,7 @@ public virtual Task Update_Where_GroupBy_First_set_constant_2(bool async)
                         == ss.Set<Order>()
                             .GroupBy(e => e.CustomerID).Where(g => g.Count() > 11).Select(e => e.First().Customer).FirstOrDefault()),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 1,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -566,7 +568,7 @@ public virtual Task Update_Where_GroupBy_First_set_constant_3(bool async)
                     c => ss.Set<Order>()
                         .GroupBy(e => e.CustomerID).Where(g => g.Count() > 11).Select(e => e.First().Customer).Contains(c)),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 24,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -577,7 +579,7 @@ public virtual Task Update_Where_Distinct_set_constant(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).Distinct(),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -588,7 +590,7 @@ public virtual Task Update_Where_using_navigation_set_null(bool async)
             async,
             ss => ss.Set<Order>().Where(o => o.Customer.City == "Seattle"),
             e => e,
-            s => s.SetProperty(c => c.OrderDate, c => null),
+            s => s.SetProperty(c => c.OrderDate, (DateTime?)null),
             rowsAffectedCount: 14,
             (b, a) => Assert.All(a, c => Assert.Null(c.OrderDate)));
 
@@ -599,7 +601,7 @@ public virtual Task Update_Where_using_navigation_2_set_constant(bool async)
             async,
             ss => ss.Set<OrderDetail>().Where(od => od.Order.Customer.City == "Seattle"),
             e => e,
-            s => s.SetProperty(c => c.Quantity, c => 1),
+            s => s.SetProperty(c => c.Quantity, 1),
             rowsAffectedCount: 40,
             (b, a) => Assert.All(a, c => Assert.Equal(1, c.Quantity)));
 
@@ -610,7 +612,7 @@ public virtual Task Update_Where_SelectMany_set_null(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")).SelectMany(c => c.Orders),
             e => e,
-            s => s.SetProperty(c => c.OrderDate, c => null),
+            s => s.SetProperty(c => c.OrderDate, (DateTime?)null),
             rowsAffectedCount: 63,
             (b, a) => Assert.All(a, c => Assert.Null(c.OrderDate)));
 
@@ -657,7 +659,7 @@ public virtual Task Update_Where_set_constant_using_ef_property(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
             e => e,
-            s => s.SetProperty(c => EF.Property<string>(c, "ContactName"), c => "Updated"),
+            s => s.SetProperty(c => EF.Property<string>(c, "ContactName"), "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -668,7 +670,7 @@ public virtual Task Update_Where_set_null(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => null),
+            s => s.SetProperty(c => c.ContactName, (string)null),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Null(c.ContactName)));
 
@@ -705,7 +707,7 @@ public virtual Task Update_Where_multiple_set(bool async)
             async,
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => value).SetProperty(c => c.City, c => "Seattle"),
+            s => s.SetProperty(c => c.ContactName, c => value).SetProperty(c => c.City, "Seattle"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(
                 a, c =>
@@ -724,7 +726,7 @@ public virtual Task Update_with_invalid_lambda_in_set_property_throws(bool async
                 async,
                 ss => ss.Set<OrderDetail>().Where(od => od.OrderID < 10250),
                 e => e,
-                s => s.SetProperty(e => e.MaybeScalar(e => e.OrderID), e => 10300),
+                s => s.SetProperty(e => e.MaybeScalar(e => e.OrderID), 10300),
                 rowsAffectedCount: 0));
 
     [ConditionalTheory]
@@ -737,7 +739,7 @@ public virtual Task Update_multiple_entity_throws(bool async)
                 ss => ss.Set<Order>().Where(o => o.CustomerID.StartsWith("F"))
                     .Select(e => new { e, e.Customer }),
                 e => e.Customer,
-                s => s.SetProperty(c => c.Customer.ContactName, c => "Name").SetProperty(c => c.e.OrderDate, e => new DateTime(2020, 1, 1)),
+                s => s.SetProperty(c => c.Customer.ContactName, "Name").SetProperty(c => c.e.OrderDate, new DateTime(2020, 1, 1)),
                 rowsAffectedCount: 0));
 
     [ConditionalTheory]
@@ -751,7 +753,7 @@ public virtual Task Update_unmapped_property_throws(bool async)
                 async,
                 ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
                 e => e,
-                s => s.SetProperty(c => c.IsLondon, c => true),
+                s => s.SetProperty(c => c.IsLondon, true),
                 rowsAffectedCount: 0));
 
     [ConditionalTheory]
@@ -762,7 +764,7 @@ public virtual Task Update_Union_set_constant(bool async)
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F"))
                 .Union(ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("A"))),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 12,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -774,7 +776,7 @@ public virtual Task Update_Concat_set_constant(bool async)
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F"))
                 .Concat(ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("A"))),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 12,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -786,7 +788,7 @@ public virtual Task Update_Except_set_constant(bool async)
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F"))
                 .Except(ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("A"))),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -798,7 +800,7 @@ public virtual Task Update_Intersect_set_constant(bool async)
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F"))
                 .Intersect(ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("A"))),
             e => e,
-            s => s.SetProperty(c => c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.ContactName, "Updated"),
             rowsAffectedCount: 0,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -812,7 +814,7 @@ join o in ss.Set<Order>().Where(o => o.OrderID < 10300)
                       on c.CustomerID equals o.CustomerID
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 2,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -827,7 +829,7 @@ on c.CustomerID equals o.CustomerID into grouping
                   from o in grouping.DefaultIfEmpty()
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -840,7 +842,7 @@ public virtual Task Update_with_cross_join_set_constant(bool async)
                   from o in ss.Set<Order>().Where(o => o.OrderID < 10300)
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -853,7 +855,7 @@ public virtual Task Update_with_cross_apply_set_constant(bool async)
                   from o in ss.Set<Order>().Where(o => o.OrderID < 10300 && o.OrderDate.Value.Year < c.ContactName.Length)
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 0,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -866,7 +868,7 @@ public virtual Task Update_with_outer_apply_set_constant(bool async)
                   from o in ss.Set<Order>().Where(o => o.OrderID < 10300 && o.OrderDate.Value.Year < c.ContactName.Length).DefaultIfEmpty()
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -887,7 +889,7 @@ from o in grouping.DefaultIfEmpty()
                       o
                   },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -901,7 +903,7 @@ from c2 in ss.Set<Customer>().Where(c => c.City.StartsWith("S"))
                   from o in ss.Set<Order>().Where(o => o.OrderID < 10300 && o.OrderDate.Value.Year < c.ContactName.Length)
                   select new { c, o },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 0,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -920,7 +922,7 @@ from o in ss.Set<Order>().Where(o => o.OrderID < 10300 && o.OrderDate.Value.Year
                       o
                   },
             e => e.c,
-            s => s.SetProperty(c => c.c.ContactName, c => "Updated"),
+            s => s.SetProperty(c => c.c.ContactName, "Updated"),
             rowsAffectedCount: 8,
             (b, a) => Assert.All(a, c => Assert.Equal("Updated", c.ContactName)));
 
@@ -938,7 +940,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
                             @"SELECT [Region], [PostalCode], [Phone], [Fax], [CustomerID], [Country], [ContactTitle], [ContactName], [CompanyName], [City], [Address]
 FROM [Customers]
 WHERE [CustomerID] LIKE 'A%'"))
-                    .ExecuteUpdateAsync(s => s.SetProperty(c => c.ContactName, c => "Updated")));
+                    .ExecuteUpdateAsync(s => s.SetProperty(c => c.ContactName, "Updated")));
         }
         else
         {
@@ -950,7 +952,7 @@ FROM [Customers]
                             @"SELECT [Region], [PostalCode], [Phone], [Fax], [CustomerID], [Country], [ContactTitle], [ContactName], [CompanyName], [City], [Address]
 FROM [Customers]
 WHERE [CustomerID] LIKE 'A%'"))
-                    .ExecuteUpdate(s => s.SetProperty(c => c.ContactName, c => "Updated")));
+                    .ExecuteUpdate(s => s.SetProperty(c => c.ContactName, "Updated")));
         }
     }
 
@@ -962,7 +964,7 @@ public virtual Task Update_Where_SelectMany_subquery_set_null(bool async)
             ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F"))
                 .SelectMany(c => c.Orders.Where(o => o.OrderDate.Value.Year == 1997)),
             e => e,
-            s => s.SetProperty(c => c.OrderDate, c => null),
+            s => s.SetProperty(c => c.OrderDate, (DateTime?)null),
             rowsAffectedCount: 35,
             (b, a) => Assert.All(a, c => Assert.Null(c.OrderDate)));
 
diff --git a/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
index ca6458f53f1..f4d530fe10a 100644
--- a/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/EntitySplittingTestBase.cs
@@ -82,7 +82,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
                     RelationalStrings.NonQueryTranslationFailedWithDetails(
                         "", RelationalStrings.ExecuteOperationOnEntitySplitting("ExecuteUpdate", "MeterReading"))[21..],
                     (await Assert.ThrowsAsync<InvalidOperationException>(
-                        () => context.MeterReadings.ExecuteUpdateAsync(s => s.SetProperty(m => m.CurrentRead, m => "Value")))).Message));
+                        () => context.MeterReadings.ExecuteUpdateAsync(s => s.SetProperty(m => m.CurrentRead, "Value")))).Message));
         }
         else
         {
@@ -93,7 +93,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
                     RelationalStrings.NonQueryTranslationFailedWithDetails(
                         "", RelationalStrings.ExecuteOperationOnEntitySplitting("ExecuteUpdate", "MeterReading"))[21..],
                     Assert.Throws<InvalidOperationException>(
-                        () => context.MeterReadings.ExecuteUpdate(s => s.SetProperty(m => m.CurrentRead, m => "Value"))).Message));
+                        () => context.MeterReadings.ExecuteUpdate(s => s.SetProperty(m => m.CurrentRead, "Value"))).Message));
         }
     }
 
diff --git a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
index e5045b7e722..fc9ee20b3ff 100644
--- a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
+++ b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs
@@ -657,7 +657,7 @@ public virtual async Task ExecuteUpdate_works_for_table_sharing(bool async)
             await TestHelpers.ExecuteWithStrategyInTransactionAsync(
                 CreateContext,
                 UseTransaction,
-                async context => await context.Set<Vehicle>().ExecuteUpdateAsync(s => s.SetProperty(e => e.SeatingCapacity, e => 1)),
+                async context => await context.Set<Vehicle>().ExecuteUpdateAsync(s => s.SetProperty(e => e.SeatingCapacity, 1)),
                 context =>
                 {
                     Assert.True(context.Set<Vehicle>().All(e => e.SeatingCapacity == 1));
@@ -670,7 +670,7 @@ await TestHelpers.ExecuteWithStrategyInTransactionAsync(
             TestHelpers.ExecuteWithStrategyInTransaction(
                 CreateContext,
                 UseTransaction,
-                context => context.Set<Vehicle>().ExecuteUpdate(s => s.SetProperty(e => e.SeatingCapacity, e => 1)),
+                context => context.Set<Vehicle>().ExecuteUpdate(s => s.SetProperty(e => e.SeatingCapacity, 1)),
                 context => Assert.True(context.Set<Vehicle>().All(e => e.SeatingCapacity == 1)));
         }
     }