Fix iv1 stripping mistakes and reduce refs to ExecutionSite.