Reverted X0 vs. B_prev change, infrastructure for N-step capturability.