Get rid of some superfluous connect deferred cancels

and other minor changes...
Merge remote-tracking branch 'origin/endpoints_trial1' into endpoints_trial1