Start of transition from unsigned long long to uint64_t