Significantly speeds up highstate on Windows by reducing the calls to query all services.

Reduces some duplicate code, and speeds things up significantly.  Cuts highstate time by 1/2 on my Windows machines.