Clean up type issues for a 64-bit build.