Remove a nonsense comparison pattern and change multiclass suffixes to be clearer.