Fix a compile warning missed during porting (wchar_t/char) and move a

variable declaration outside of a loop. #2810 was when this first went in.