Fixes for Self-Validation Issues #12354

Job	Run time
gobview (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda, 14)	7m 31s
regression (ubuntu-22.04, ocaml-variants.4.14.2+options,ocaml-option-flambda)	8m 13s
regression (macos-13, ocaml-variants.4.14.2+options,ocaml-option-flambda)	27m 8s
extraction	0s
	42m 52s

Provide feedback