More rewriting plan compile

Hopefully more clear.
2 files changed