Fixes for Self-Validation Issues #12357

Job	Run time
extraction	0s
gobview (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda, 14)	7m 51s
regression (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda)	8m 11s
regression (macos-13, ocaml-variants.4.14.2+options,ocaml-option-flambda)	22m 27s
	38m 29s

Provide feedback