Revert previous change that expanded the range of (unsigned) long long, and also reduce one number from the lower range of the signed type.  This aligns with ES coercion behaviour.