Minor polishing
- Avoid orphans - We actually can't check that the open states are consistent directly as we would need to statefully get that info from the SUT.