Assert added to track loop unwinding enough depth
Debugging analyses
Some files merged