Fixes for Self-Validation Issues #12370

Job	Run time
regression (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda)	7m 48s
regression (macos-13, ocaml-variants.4.14.2+options,ocaml-option-flambda)	22m 58s
extraction	0s
gobview (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda, 14)	7m 33s
	38m 19s

Provide feedback