Changes to make "-i dassl" work again.