Second round of follow-ups to #4347

Just so it doesn't get lost, see: https://github.com/lightningdevkit/rust-lightning/pull/4347#pullrequestreview-3876272258