I couldn't decide.  In practice all the services (Index, Collector, Storage) all get shutdown at the same time, so it doesn't matter.  I suppose moving them all into the collector shutdown at least puts it all in the same place.  I'll make that change.