Replaced call to TYPEP by newly introduced predicates.