Cross-refs now use canonical keys instead of node ID.