Split on `to` and `carry`.
Previous fix for distance marker ordering did not
take the `where` key into account; now we do.