Move addPred and removePred out-of-line.