[Resolver] Partly refactored hacky canResolveBase variable