#921 gets rid of a superfluous _make_connection function. I'm fairly sure more duplicative functions can be removed.

Note that I kept _make_connection because I didn't want to clutter #921 with a ton of changed calls. Those need to be fixed too.