peer: more addr handler changes.