[MOD] Cleaned up `VarScope` and `FuncItem`.
Merge pull request #827 from LeoWoerteler/simpler-var-scope

[MOD] Cleaned up `VarScope` and `FuncItem`.