SCL-7465 Partial fix for expected types resolving