Stop the save and restore of currStackDepth.  Just manage it correctly so
it doesn't need correcting.
merge trunk