Preparing for escape rewrite