FIX: Allow connectors to be stored directly and as closures