I think the old code was good as @lamblin told, but your change make think a little faster, so we can keep it.

I'll remove the remark in that remark in the title of this PR.