FIXUP: Simplify activate_connection.