[bitcoin] Merged PR from glozow: rpc: followups for 33106 https://github.com/bitcoin/bitcoin/pull/33189