Switching to your wrapper makes no difference for me. Yes, if you make small changes the code can crash in different places, though I haven't been able to reproduce your assertion failure.
Do you think you've the actual bug? Could you point me to it?
