Remove usage of isinstance() with unioned types

Remove usage of isinstance() with unioned types #1232