Improved treatment of symbols.