Moved the suffix based blocks into the Scorer.