Fix: eliminate mutable objects in params