GPII-543: Move requiredAuxGrades into options.