fix double declaration problem in variable declarations remove TrackingSet rename StackedSetMap to StackedMap and remove add method add more scope analysis test