Rewriting more stuff