Fix for stack overflow issue in SAW model, iterative rewrite

[ryle-goehausen]

Not extensively tested other than locally -- but addresses the main problem with rewrite of core walker.