Separate BridgeAddr and PtTargetAddr

As per #668 (comment 2858220)

This commit is difficult to split up.

The innards of BridgeAddr and PtTargetAddr are still a bit entangled.

Merge request reports

Loading