Refactor away confusing UnresolvedHandlerInfo