Fix merge fallout regarding unwinding.