Separate closing a single connection.
Clean up the 'shift left' a bit.
Add couple of asserts.