Fix NEXT, again
Fix graph corruption issue
Test cases, etc.
Coalesce NEXT,NEXT into a single NEXT