Normalize connect()s

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