Restructured rewrites.