Improved symbol resolver.