Comment 3 for bug 462013

Sure. No problem. Just submitted the refactoring branch.

I will resubmit this fix after that branch is in devel.

Since Salgado's comment does not mention any bug report / bug nr, I was thinking he left that comment to be fixed together with ther first branch that come upon it.