Connections: simplify code flow a tiny bit