Do type cleanup in pairing api

[davidv1992]

At a minimum, we need to make S2NodeId a uuid, probably some other types as well.