^ Yep, my concern was 3A5000 with VCSR enabled can be vulnerable.
However, the experiment result is counter-intuitive to me after all; are you aware that perhaps *some* 3A5000's in the wild actually have functional VCSR? If so, the state obviously needs isolation (saving/restoring simply becoming no-ops on later steppings), but otherwise this cleanup should be correct.