Remove getTypeOf() method and add more type predicates