Switched to new symbol table manager (still needs tweaking).