Kill iv1 with fire

Remove branching on whether IV2 is enabled.
Try to reduce the references to ExecutionSite (2 more to go).