Now distinguish between disk change kinds and disk changes (eventually a tuple of a kind with a lambda). The kind does conflict resolution. The change itself participates in parallel changesets and curries the operation until it can be executed.