Simplify Service_Resolver by adding Argument_Resolver - new class.