Improved the "x is y" and "type(x) is y" type guards to better handle…

Improved the "x is y" and "type(x) is y" type guards to better handle… #7729