connect:  Fix up bind-local merge issues.

Still needs more testing, maybe just plain re-architecting.

Signed-off-by: Ben Greear <greearb@candelatech.com>