Minor fixes for dcshift remover.