WIP: Remove expecting_disconnect.
WIP: Fixes.