Make non- match deterministic except for nonces

(whoops)