fixup! fixup! fixup! WIP: better precondition checks for harness (checks often fail due to some kind of race)