(refactor) Update for chain.link.

Eventually, once core is pretty much set, we should agree on a standard order for this.