Address comments from code review. #2473

Job	Run time
Bitrot check	4m 20s
Clippy (MSRV)	4m 28s
Latest build on ubuntu-latest	1m 46s
Build target wasm32-wasi	3m 51s
Clippy (beta)	17s
Latest build on windows-latest	6m 15s
Latest build on macOS-latest	4m 49s
Code coverage	20m 39s
Intra-doc links	4m 52s
Rustfmt	15s
protobuf consistency	4m 23s
UUID validity	3s
Test on ubuntu-latest	12m 56s
Test on ubuntu-latest with --features orchard	12m 58s
Test on ubuntu-latest with --features unstable-nu6	12m 52s
Test on ubuntu-latest with --features zfuture	13m 24s
Test on windows-latest	17m 36s
Test on windows-latest with --features orchard	17m 43s
Test on windows-latest with --features unstable-nu6	18m 13s
Test on windows-latest with --features zfuture	17m 42s
Test on macOS-latest	26m 24s
Test on macOS-latest with --features orchard	27m 46s
	3h 53m 32s

Provide feedback