Hi Tobias,
As a variant, I now use the latter (via the else branch). Either variant produces the same original tree. One can argue which variant is clearer; I think both are fine – pick one.
I think the second one (the one you just attached) looks better.
So, OK for trunk. Thanks for the patch!
Regards
Thomas
