r25031: Use pointers to services rather than service numbers when possible.