Some additional updates for running under proof.

No match.