Improved handling of symbol definitions.