Make the filter-fn the first arg to be consistent with filter