Refactor `resolve_with_disambiguator` into a separate function
Refactor `resolve_with_disambiguator` into a separate function

aidancully/rust,aidancully/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust,aidancully/rust,graydon/rust,graydon/rust,graydon/rust,graydon/rust