This should be reverted. `resolve` returns vars or nil.