diff --git a/Orm/Xtensive.Orm/Core/Extensions/EnumerableExtensions.cs b/Orm/Xtensive.Orm/Core/Extensions/EnumerableExtensions.cs
index 3ff66c294..06fc18695 100644
--- a/Orm/Xtensive.Orm/Core/Extensions/EnumerableExtensions.cs
+++ b/Orm/Xtensive.Orm/Core/Extensions/EnumerableExtensions.cs
@@ -582,5 +582,11 @@ public static List<TValue> SortTopologically<TValue>(this IEnumerable<TValue> va
       var result = TopologicalSorter.Sort(graph);
       return result.HasLoops ? null : result.SortedNodes.SelectToList(node => node.Value);
     }
+
+    internal static IReadOnlyList<T> ToReadOnlyList<T>(this IEnumerable<T> seq) =>
+      seq switch {
+        IReadOnlyList<T> roList => roList,
+        var s => s?.ToList()
+      };
   }
 }
diff --git a/Orm/Xtensive.Orm/Linq/ExpressionVisitor.cs b/Orm/Xtensive.Orm/Linq/ExpressionVisitor.cs
index 4ee023d76..29c4b3190 100644
--- a/Orm/Xtensive.Orm/Linq/ExpressionVisitor.cs
+++ b/Orm/Xtensive.Orm/Linq/ExpressionVisitor.cs
@@ -21,7 +21,7 @@ public abstract class ExpressionVisitor(bool isCaching = false) : System.Linq.Ex
   {
     private readonly Dictionary<Expression, Expression> cache = isCaching ? new() : null;
 
-    protected virtual IReadOnlyList<Expression> VisitExpressionList(IReadOnlyList<Expression> expressions) =>
+    protected virtual IEnumerable<Expression> VisitExpressionList(IReadOnlyList<Expression> expressions) =>
       VisitList(expressions, Visit);
 
     public override Expression Visit(Expression e)
@@ -69,7 +69,7 @@ protected virtual ElementInit VisitElementInitializer(ElementInit initializer)
     /// </summary>
     /// <param name="original">The original element initializer list.</param>
     /// <returns>Visit result.</returns>
-    protected virtual IReadOnlyList<ElementInit> VisitElementInitializerList(ReadOnlyCollection<ElementInit> original) =>
+    protected virtual IEnumerable<ElementInit> VisitElementInitializerList(ReadOnlyCollection<ElementInit> original) =>
       VisitList(original, VisitElementInitializer);
 
     /// <inheritdoc/>
@@ -236,29 +236,31 @@ protected override MemberMemberBinding VisitMemberMemberBinding(MemberMemberBind
     /// </summary>
     /// <param name="original">The original binding list.</param>
     /// <returns>Visit result.</returns>
-    protected virtual IReadOnlyList<MemberBinding> VisitBindingList(ReadOnlyCollection<MemberBinding> original) =>
+    protected virtual IEnumerable<MemberBinding> VisitBindingList(ReadOnlyCollection<MemberBinding> original) =>
       VisitList(original, VisitBinding);
 
-    public static IReadOnlyList<T> VisitList<T>(IReadOnlyList<T> original, Func<T, T> func) where T : class
+    public static IEnumerable<T> VisitList<T>(IReadOnlyList<T> original, Func<T, T> func) where T : class
     {
-      T[] ar = null;
-      for (int i = 0, n = original.Count; i < n; i++) {
+      for (int i = 0, n = original.Count; i < n; ++i) {
         var originalValue = original[i];
-        var p = func(originalValue);
-        if (ar != null) {
-          ar[i] = p;
-        }
-        else if (!ReferenceEquals(p, originalValue)) {
-          ar = new T[n];
-          for (int j = 0; j < i; j++) {
-            ar[j] = original[j];
-          }
-          ar[i] = p;
+        if (func(originalValue) is var p && !ReferenceEquals(p, originalValue)) {
+          return VisitListIterator(original, func, p, i);
         }
       }
-      return ar?.AsSafeWrapper() ?? original;
+      return original;
     }
 
+    private static IEnumerable<T> VisitListIterator<T>(IReadOnlyList<T> original, Func<T, T> func, T p, int pIdx) where T : class
+    {
+      for (var i = 0; i < pIdx; ++i) {
+        yield return original[i];
+      }
+      yield return p;
+      for (int i = pIdx + 1, n = original.Count; i < n; ++i) {
+        yield return func(original[i]);
+      }
+    }
+    
     protected override MemberListBinding VisitMemberListBinding(MemberListBinding binding)
     {
       var bindingInitializers = binding.Initializers;
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/OwnerRemover.cs b/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/OwnerRemover.cs
index 39d19f790..d5945cc54 100644
--- a/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/OwnerRemover.cs
+++ b/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/OwnerRemover.cs
@@ -67,7 +67,7 @@ internal override Expression VisitConstructorExpression(ConstructorExpression ex
       var nativeBingings = expression.NativeBindings
         .Zip(newNativeBindings)
         .ToDictionary(item => item.First.Key, item => item.Second);
-      return new ConstructorExpression(expression.Type, bindings, nativeBingings, expression.Constructor, newConstructorArguments);
+      return new ConstructorExpression(expression.Type, bindings, nativeBingings, expression.Constructor, newConstructorArguments.ToReadOnlyList());
     }
 
     internal override Expression VisitEntityExpression(EntityExpression expression)