conn.c: Code cleanup