Clean up protocol selection code.  Use protocol.requestedService when
inserting new job