Thanks for comments, Euler!
> ... is hard to understand. Instead, you could separate the conditional
> expression into a variable.
Fixed the patch to be more descriptive and to avoid repeating same
computation over and over again. See v2 of the patch attached.
> I don't think those are mandatory.
Why do you think that? Should I remove them or maybe send as separate
patch?
Cheers,
Roma