More work on ThreadUpdater.disconnect()