End the reign of Ints

While Longs are not the perfect solution, they hopefully buy us another
few decades of time to come up with one.