Along the way, remove the XMultiServiceFactory member from
a few classes that were not using it.

Change-Id: I9ee2c2ebc01144301ed8e489bd92b4695ff263d0