Abstract out duplicate resolver code
Merge pull request #74 from Obvious/kyle-cleanup-resolver-code

Abstract out duplicate resolver code