Summary: rethink of Conn. some other fixes.

Test Plan: manual, unit tests.

Reviewers: ben

Subscribers: Engineering

Differential Revision: https://phabricator.poptip.com/D3016