Remove the notion of a 'persistent' connection

This exposed a bug in the event handling which is also fixed.