This should be centralized in connect_finish.