Add a tombstone-less, orswot backed Map
Add orswot and map to list of sorted mods
Update model to match precondition failures

(No more idempotent remove of fields)