Make external-indexed-data more robust.