I like the second one slightly more, but I'm also happy to be
outvoted. I'm working on committing the first one, but I ran into a
couple of CI failures[1] that I haven't understood yet. It could be
my patch's fault or turn out to be something already in the tree...
looking into that...
[1] https://cirrus-ci.com/task/4737677834059776