Patch attached. Will apply it tonight unless there are objections
together with the other declaration-after-statement and unused-variable
patch.
Btw: I see no value in adhering to this ancient C90 rule. Can't we just
drop it?

- Andreas