Fix narrowing related code for types with overloaded __new__ (#20676)

I introduced some more instances of #12320

Noticed while analysing #20674

Author: hauntsaninja

mypy/checker.py

@@ -6494,7 +6494,7 @@ def comparison_type_narrowing_helper(self, node: ComparisonExpr) -> tuple[TypeMa
                 and not self.is_literal_enum(expr)
                 # CallableType type objects are usually already maximally specific
                 and not (
-                    isinstance(p_expr := get_proper_type(expr_type), CallableType)
+                    isinstance(p_expr := get_proper_type(expr_type), FunctionLike)
                     and p_expr.is_type_obj()
                 )
                 # This is a little ad hoc, in the absence of intersection types

mypy/typeops.py

@@ -1006,7 +1006,7 @@ def is_singleton_identity_type(typ: ProperType) -> bool:
         return typ.is_enum_literal() or isinstance(typ.value, bool)
     if isinstance(typ, TypeType) and isinstance(typ.item, Instance) and typ.item.type.is_final:
         return True
-    if isinstance(typ, CallableType) and typ.is_type_obj() and typ.type_object().is_final:
+    if isinstance(typ, FunctionLike) and typ.is_type_obj() and typ.type_object().is_final:
         return True
     return False