> First let's see what is best in this specific case.
> Afterward we could see if any part of it is worth generalizing.

The attached patch should handle the specific case.