diff --git a/lib/chain/chain.js b/lib/chain/chain.js
index 53815c71..f23988ae 100644
--- a/lib/chain/chain.js
+++ b/lib/chain/chain.js
@@ -1597,7 +1597,7 @@ Chain.prototype._getLocator = co(function* getLocator(start) {
  * Will also calculate "orphan soil" -- the block needed
  * in * order to resolve the orphan root.
  * @param {Hash} hash
- * @returns {Object?} root - { root: {@link Hash}, soil: {@link Hash} }.
+ * @returns {Hash}
  */
 
 Chain.prototype.getOrphanRoot = function getOrphanRoot(hash) {
diff --git a/lib/primitives/coin.js b/lib/primitives/coin.js
index af40a9bd..8083548c 100644
--- a/lib/primitives/coin.js
+++ b/lib/primitives/coin.js
@@ -340,54 +340,6 @@ Coin.fromCompressed = function fromCompressed(data, enc) {
   return new Coin().fromCompressed(data);
 };
 
-/**
- * Serialize the coin to an "extended" format,
- * including both the hash and the index.
- * @param {String?} enc - Encoding, can be `'hex'` or null.
- * @returns {Buffer|String}
- */
-
-Coin.prototype.toExtended = function toExtended(writer) {
-  var p = BufferWriter(writer);
-
-  this.toRaw(p);
-  p.writeHash(this.hash);
-  p.writeU32(this.index);
-
-  if (!writer)
-    p = p.render();
-
-  return p;
-};
-
-/**
- * Inject properties from extended serialized data.
- * @private
- * @param {Buffer} data
- */
-
-Coin.prototype.fromExtended = function fromExtended(data) {
-  var p = BufferReader(data);
-  this.fromRaw(p);
-  this.hash = p.readHash('hex');
-  this.index = p.readU32();
-  return this;
-};
-
-/**
- * Instantiate a coin from a Buffer
- * in "extended" serialization format.
- * @param {Buffer} data
- * @param {String?} enc - Encoding, can be `'hex'` or null.
- * @returns {Coin}
- */
-
-Coin.fromExtended = function fromExtended(data, enc) {
-  if (typeof data === 'string')
-    data = new Buffer(data, enc);
-  return new Coin().fromExtended(data);
-};
-
 /**
  * Inject properties from TX.
  * @param {TX} tx
diff --git a/lib/primitives/tx.js b/lib/primitives/tx.js
index a7cd7e83..6e904152 100644
--- a/lib/primitives/tx.js
+++ b/lib/primitives/tx.js
@@ -795,25 +795,22 @@ TX.prototype.isCoinbase = function isCoinbase() {
 };
 
 /**
- * Test whether the transaction is a replacement.
+ * Test whether the transaction is replaceable.
  * @returns {Boolean}
  */
 
 TX.prototype.isRBF = function isRBF() {
   var i, input;
 
+  // Core doesn't do this, but it should:
+  if (this.version === 2)
+    return false;
+
   for (i = 0; i < this.inputs.length; i++) {
     input = this.inputs[i];
 
-    if (!input.isRBF())
-      continue;
-
-    if (this.version === 2) {
-      if (!(input.sequence & constants.sequence.DISABLE_FLAG))
-        continue;
-    }
-
-    return true;
+    if (input.isRBF())
+      return true;
   }
 
   return false;
@@ -878,75 +875,114 @@ TX.prototype.getOutputValue = function getOutputValue() {
 
 /**
  * Get all input addresses.
- * @returns {Base58Address[]} addresses
+ * @private
+ * @returns {Array}
  */
 
-TX.prototype.getInputAddresses = function getInputAddresses() {
+TX.prototype._getInputAddresses = function getInputAddresses() {
   var table = {};
-  var addresses = [];
+  var addrs = [];
   var i, address, hash;
 
+  if (this.isCoinbase())
+    return [addrs, table];
+
   for (i = 0; i < this.inputs.length; i++) {
     address = this.inputs[i].getAddress();
-    if (address) {
-      hash = address.getHash('hex');
-      if (!table[hash]) {
-        table[hash] = true;
-        addresses.push(address);
-      }
+
+    if (!address)
+      continue;
+
+    hash = address.getHash('hex');
+
+    if (!table[hash]) {
+      table[hash] = true;
+      addrs.push(address);
     }
   }
 
-  addresses.table = table;
-
-  return addresses;
+  return [addrs, table];
 };
 
 /**
  * Get all output addresses.
- * @returns {Base58Address[]} addresses
+ * @private
+ * @returns {Array}
  */
 
-TX.prototype.getOutputAddresses = function getOutputAddresses() {
+TX.prototype._getOutputAddresses = function getOutputAddresses() {
   var table = {};
-  var addresses = [];
+  var addrs = [];
   var i, address, hash;
 
   for (i = 0; i < this.outputs.length; i++) {
     address = this.outputs[i].getAddress();
-    if (address) {
-      hash = address.getHash('hex');
-      if (!table[hash]) {
-        table[hash] = true;
-        addresses.push(address);
-      }
+
+    if (!address)
+      continue;
+
+    hash = address.getHash('hex');
+
+    if (!table[hash]) {
+      table[hash] = true;
+      addrs.push(address);
     }
   }
 
-  addresses.table = table;
-
-  return addresses;
+  return [addrs, table];
 };
 
 /**
  * Get all addresses.
- * @returns {Base58Address[]} addresses
+ * @private
+ * @returns {Array}
  */
 
-TX.prototype.getAddresses = function getAddresses() {
-  var input = this.getInputAddresses();
+TX.prototype._getAddresses = function getAddresses() {
+  var inputs = this._getInputAddresses();
   var output = this.getOutputAddresses();
+  var addrs = inputs[0];
+  var table = inputs[1];
   var i, hash;
 
   for (i = 0; i < output.length; i++) {
     hash = output[i].getHash('hex');
-    if (!input.table[hash]) {
-      input.table[hash] = true;
-      input.push(output[i]);
+
+    if (!table[hash]) {
+      table[hash] = true;
+      addrs.push(output[i]);
     }
   }
 
-  return input;
+  return [addrs, table];
+};
+
+/**
+ * Get all input addresses.
+ * @private
+ * @returns {Address[]} addresses
+ */
+
+TX.prototype.getInputAddresses = function getInputAddresses() {
+  return this._getInputAddresses()[0];
+};
+
+/**
+ * Get all output addresses.
+ * @returns {Address[]} addresses
+ */
+
+TX.prototype.getOutputAddresses = function getOutputAddresses() {
+  return this._getOutputAddresses()[0];
+};
+
+/**
+ * Get all addresses.
+ * @returns {Address[]} addresses
+ */
+
+TX.prototype.getAddresses = function getAddresses() {
+  return this._getAddresses()[0];
 };
 
 /**
@@ -955,11 +991,14 @@ TX.prototype.getAddresses = function getAddresses() {
  */
 
 TX.prototype.getInputHashes = function getInputHashes(enc) {
-  var input = this.getInputAddresses();
-  var i;
+  var i, input, table;
 
-  if (enc === 'hex')
-    return Object.keys(input.table);
+  if (enc === 'hex') {
+    table = this._getInputAddresses()[1];
+    return Object.keys(table);
+  }
+
+  input = this.getInputAddresses();
 
   for (i = 0; i < input.length; i++)
     input[i] = input[i].getHash();
@@ -973,11 +1012,14 @@ TX.prototype.getInputHashes = function getInputHashes(enc) {
  */
 
 TX.prototype.getOutputHashes = function getOutputHashes(enc) {
-  var output = this.getOutputAddresses();
-  var i;
+  var i, output, table;
 
-  if (enc === 'hex')
-    return Object.keys(output.table);
+  if (enc === 'hex') {
+    table = this._getOutputAddresses()[1];
+    return Object.keys(table);
+  }
+
+  output = this.getOutputAddresses();
 
   for (i = 0; i < output.length; i++)
     output[i] = output[i].getHash();
@@ -991,11 +1033,14 @@ TX.prototype.getOutputHashes = function getOutputHashes(enc) {
  */
 
 TX.prototype.getHashes = function getHashes(enc) {
-  var hashes = this.getAddresses();
-  var i;
+  var i, hashes, table;
 
-  if (enc === 'hex')
-    return Object.keys(hashes.table);
+  if (enc === 'hex') {
+    table = this._getAddresses()[1];
+    return Object.keys(table);
+  }
+
+  hashes = this.getAddresses();
 
   for (i = 0; i < hashes.length; i++)
     hashes[i] = hashes[i].getHash();
@@ -1042,15 +1087,12 @@ TX.prototype.fillCoins = function fillCoins(coins) {
     map = {};
     for (i = 0; i < coins.length; i++) {
       coin = coins[i];
-      if (coin instanceof TX) {
+      if (coin instanceof TX)
         map[coin.hash('hex')] = coin;
-      } else if (coin instanceof Coin) {
-        assert(typeof coin.hash === 'string');
-        assert(typeof coin.index === 'number');
+      else if (coin instanceof Coin)
         map[coin.hash + coin.index] = coin;
-      } else {
+      else
         assert(false, 'Non-coin object passed to fillCoins.');
-      }
     }
     coins = map;
   }