Upstream enhancements to librustzcash