Improve flexibility when switching between grading modes for existing class.