Style fixes.
Switch CONNECT data listener removal to use events interface instead of misguided attempt to use internals.