make CR spill and restore 64-bit clean (no functional change), and fix some other...