> Could you try rewriting -map: so that it doesn't use -flattenMap:?

I tried, but I failed, without opening up a rabbit hole of things to rewrite (e.g. see the approach in #1130). I would have loved to have done that though, as you're totally right that the performance gain for all uses of `-map:` would be lovely.