FELIX-3645 Finish unlocking around all calls to register service and obtain dependent services. Some cleanup.