Redid generic registration predicates.