Optional variable declarations

Yes, I see your point. In the beginning of the discussion, I proposed
optional variable declarations, that would avoid interaction with the existing code.