connection and tcp were still using set_listener instead of add/remove listener.