Fix (temporarily?) ability to have multiple servers/clients defined for each service.