Simplify some affectations.

It seems than sometimes, "local" declaration and affectation
at the same time, is a problem. But not here.