Moving to 64-bit integers for all