Eli Zaretskii <eliz@gnu.org> writes:

> Thanks, but could you rewrite so as not to call char-after more than
> once?

Sure,