Re-sync after merge & relax bignum dependency restriction slightly