This simplifies the test case added in e399dd601 to only require indvars and simple-loop-unswitch. This allows adding the test case for #58158 to the same file, keeping related tests together.