This sounds like a good improvement to me. We don’t have bandwidth to take this change right now, but I am marking this as pr-welcome, meaning, we’re happy to review a contribution from the community making the proposed change here.
Thanks for the suggestion @icaria36.