fix SWAP and handle bignum storage keys