Modify registration of Service Providers.

This change allows your service providers to be more easily testable without `$that` type hacks.