Refactor: Eliminate `resolveUser`