pcwalton Un-revert "Use different syntax for checks that matter to typestate",… …