There are several sections of code that currently are not having rewriting done, and they probably should. We need to come up with test cases that will expose the lack of rewriting and then implement the rewriting sections.