Changes the non-exhaustive match error message to generate more general witnesses.
construct_witness
Fixes #35609.