further parsing table cleanup - reducing amount of naked pointers