Squashed the UINT64_C not defined junk.