Even more PredictionMode fixes.

Once the comparator has been taken care of I think all the rest of the
issues will fade away.