WIP More thoughts about rewriting.