Separate symbol canonicalization from symbol resolution