More rewrites!