Rearrange and simplify connection startup. It still seems reasonable to keep the concept of the start_infrastructure_fun around, that closure hides quite a lot of state. The other closure can go though.