further cleanup for (E)ProverI.