Continued work on symbol resolver.