* Fix PR/1407.
* Keep filename/lineno information for variables, for debugging.
11 files changed