Update for changes in rustc and rust-bitcoin