Merge pull request #2036 from techee/symbol_tree_vartype