Rework types to allow for more borrowing

[davidv1992]

Some of the types are currently always owned, where that is not necessarily sensible. Improving this would also allow us to use PairingToken in more places in the public interface.