Fixed up the DC robustness changes a bit.