Fix scoping for multiple arguments in filter-map expressions