Finish for now the 64-bit changes.