Move isinstance checks back to unary type checks