I can't quite seem to find `ServiceFactory`, or something similar, in the master or my branch (which is rebased with the master).