Changes to support the change from unordered_map to SymbolTable.