> Looking forward to comments.

Wow, Sashiko is happy and did not find any pre-existing issues? I am
amazed...

Anyhow, I wanted to repeat my thanks to previous reviewers. I think this
outcome is in deed cleaner and easier to understand / maintain.