Philip Kaludercic <philipk@posteo.net> writes:

> How does the following look like:

I have prepared a proper patch: