Minor cleanup of updater connection handling