Minor speed-up on the classifier.