Fixed more potential hang cases for incremental recursion.