Fix DoSubI to use ToOperand as well