Fixes #3347 : store unexpanded and expanded version of variables for
more robust reporting
Merge pull request #143 from ncharles/arc_3334/dev/3347_store_unexpanded_version_of_values_as_well

Fixes #3347 : store unexpanded and expanded version of variables for