Updates to allow proper disposal of IWatchableServices.