Big cleanup for the Peer / PeerNode / NodeInfo mess.