Rationalize core predicates.
Starting to remove TNumber - manage impacts.