I changed this here specifically because I sensed a movement away from the "connection" syntax to the "service" syntax across the fog project, not due to the (unimplemented) Discovery approach. In retrospect, I should have left this for a later refactoriing... given the amount of work to refactor this code, I haven't staying as focused as I should have been in a few cases like this. I keep seeing all sorts of things I want to refactor... apologies.