Merge #10558: Address nits from per-utxo change