SI-6455 under -Xfuture, don't rewrite .withFilter to .filter

This has been deprecated for two major releases now,
but `filter`'s still preferred over `withFilter` in the wild.
SI-6455 util.Try supports withFilter
Merge pull request #3566 from adriaanm/t6455

SI-6455 no longer rewrite .withFilter to .filter