fix: address review feedback from PRs #21284 and #21237 (backport #21369)#21586

benesjan merged 1 commit intobackport-to-v4-next-stagingAztecProtocol/aztec-packages:backport-to-v4-next-stagingfrom

claudebox/backport-21369-v4-nextAztecProtocol/aztec-packages:claudebox/backport-21369-v4-nextCopy head branch name to clipboard