Simplify closures that capture prop names, and add a missing closure.