Improve a couple of the bignum macros. Note, this doesn't eliminate