Allow reoptimization of GS in self-consistency