> Just wanted to check if this is ready to go or more tests are needed?

From my tests, this patch series fixes the issue. I'd just like to avoid
the extra callback. However, my tries to do that failed so far. And now
I'll be away for two weeks.

Dunno, maybe we merge the series and if I come up with something else
that works, we can add it incrementally?