Refactor: convert more connect statements to new syntax.

Authored by johanneszarl on Sep 9 2019, 9:17 PM.