added @() expressions to expand_vars - first draft, expect bugs