Removed the rather ugly service locator, favoring dependency injection, and static classes when appropriate.