Add the loop variable of a for each loop to the local variable map

[kelloggm]

Fixes #165

Also did a minor optimization and a minor change to error reporting (for debugging purposes).