Move variable definitions into the blocks where they are really needed,

so that warnings about unused variables don't appear if those blocks
are removed by the C preprocessor.

Submitted by:
Reviewed by:
PR: