Replace 8-byte BigInts with Longs