refactor: give Peers knowledge of Ourself.Peer and MacCache
so their use (when applying updates and performing gc) is opaque
cosmetic: more logical field order
cosmetic: move a method