Issue #5: Improved handling of declared variables in the VAST a bit