got push/pop scope phase in; reorg symbol hierarchy