On 2 there is this now:

https://alasdair.github.io/#_modules

But it's very new and the RISC-V model doesn't use it yet. I think it's also just a first step rather than fully solving the problem.