Cleaning up some minor issues in Connection to get a better handle on connection handling.