That's why these peer reviews are for ;-)

I'm still trying to make sure that I understand everything right. Could you share your testing world by any chance?

BTW - you may notice that there are a few style errors. Nothing problematic, let me know if you can fix them along with the work, otherwise I'll run a fix when the patch is ready to merge.