Tidy up some more getConnection calls.