Upgrade default tokenizing to emit pairs of URNs.