Be more tolerant when connecting with ill-formed addresses, e.g. NodeID
Merge cleanup