Minor refactor symbol table