Further clean up stepUnrollCtx