Fix more 32/64-bit warnings.