Remove dead variable pointed out by GCC 4.6 warnings, and reflow this a little

to scope a variable more tightly per llvm coding style. No functional change.

llvm-svn: 130684