These are just some cleanups for the primitive restart tests. I did these while I was getting ready to do something else with the tests. I got distracted and forgot about about whatever I was originally going to do. :(