Simplify Service_Resolver class.