A handful of small changes.

A final commit before I attempt to depricate all of the unused predictor stuff.

Stand with me now.