navigator: don't give up after DO_JUMPS
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator