Finally (?) fix annoying bug in Clang 64-bit environments