Obsoletes my earlier patch to fix the Wdeclaration-after-statement warning.

- Andreas