Like this?
Yes, that's what I meant.
You mean turning the `current_importer` global into a local parameter with such name?
Yes. I originally meant it only for relay's needs, but if we can do that for all cases that's even better. Here is a draft of something like that: https://gitlab.winehq.org/jacek/wine/-/commits/modref. It's barely tested and I'm not yet sure about it (esp. apisets), but I think it makes things easier to follow.