Simplify the if else for local usage

There was a simple pattern here whereby if we connect using the bind
method then we listen for new connections on 'connect' and listen for
ready on the 'bind' event, these events are switched when using the
connect method.

- [ ] Ready to merge
- [ ] Tested for production