Clean up, correctly track reconnects.