Finish atomicity rewrites