small changes to nondet matcher; not much improvement