Minor cleanup of SymbolMap changes.