Some progress on rewrite.