We want to land #997 asap, so leave a few cleanups until post-merge, eg * https://github.com/rust-bitcoin/rust-lightning/pull/997#discussion_r711401110 * https://github.com/rust-bitcoin/rust-lightning/pull/997#discussion_r711391333