Simplified connection management a bit.