Issue #5888: Type resolution adaptation