Fix unscoped local variables.

I noticed an unscoped local variable earlier; ran varscoper and noticed a few more...