Merge "cosmetics: consistently use [u]int64_t"