> Someone™ should introduce
> a helper function that does this right and then use it everywhere else.

Yep. I'lll look into making a patch for the trunk.

[ Does anyone still call it "trunk" or it is now just "master"? Am I uncool / too old fashioned for using "trunk"? ;-) ]