Adapt to Resolver updates in the Core.