Fix some stack overflows caused by recursion with identical arguments/state.