Reorder IIPs
Make runtime reset handling runtime-independent