More work on interpreter rewrite