Restructuring away from composite SC tests and toward a single modal SC test, plus some subtle corrections to logic.