Restore per-iteration var bindings (strange side effect adverted); Fix renaming bug;

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>