Protect against a buffer overflow in symbolmap
Some code reformatting in SymbolMap