Eli Zaretskii <eliz@gnu.org> writes:

> Then maybe the simplest solution would be to do the same.

Yes, I tend to think the same way.  Do the attached changes make sense
to you?  Thanks.