Tidy up reconnect logic.