Doing away with `Link.Companion`

Though the inevitability of this became apparent whilst fixing tests,
this actually gets no new tests working.