Hi Ben, Well, for me to consider any of these, you really should come with commit logs and reasons that actually make sense outside of your environment :) I committed a note that replaces patch 1. I don't like 2-4, that just adds state and one should never hit it. If you're hitting these you should investigate the root cause, not fix the symptoms. 5 seems like it might be reasonable, but it's hard to read and understand, maybe revisit that? I tend to think the previous module options along the lines of patch 6 were a mistake, rather than add more ... 7 is totally not understandable, but might be legitimate? Unlikely, but hard to say. 8 I don't like at all. How about you do it in the driver somehow? 9 is like 2-4 really, I guess maybe this one I could get behind if it came with a commit log that actually explains why one is likely to hit this multiple times or something? 10 we did to fix other behaviour, so ... johannes