Port to new resolver API.