Tweak types to prefer uint64_t over unsigned long