48809579 Refactor services registration to be more general, register
most prospective API services.