Support separate overrides for resolvers and resolver factories