move some basic predicates higher up