It turns out that this add is done in two different places, one with the local user, the other with the peer. Therefore collapsing this into one method doesn't actually buy us anything significant.