This factors in all revisit skip besides Upstream skip. If you're not going for Cortex Power skip, you can add in a revisit split after Toxic Waste or in the backtracking part of the run.