I think that's a good long-term change suggestion, @gdusbabek. However, I think that doing that as a separate PR is probably fine, and that it's likely not super-high priority.

I think that fixing the instrumentation issue but doing the work inside of RollupRunnable is fine for now.