Make optimistic locking more likely to work correctly.