Refactored symbol resolver.