Normalize connect()s

Change-Id: I1305abd51cb6ae856215af63807e66c433982c26
Reviewed-by: Daniel Teske <daniel.teske@digia.com>