Improvements to !enable and !disable.