More 32-bit removal.