Amend me later.
Fix bad code regression.
Fix ABI issue on MS (possibly others).