Fix bad code regression.
Fix ABI issue on MS (possibly others).
Small wave of reducing IRState.