This resolves a major source of pain with Blockstream, though it does mean that it depends on very new versions of Geth/Parity that have this functionality.