Minor

More local scoping vars.