Ok, I've attached a patch with more assertions. Also, can you try with a clean
checkout of next and see if the problem still occurs?