Some minor cleaning up of our connection statements.