Core: refactor service tracking (#686).

Remove distinction between core service trackers and plugin service trackers.

See #686.