Partial repairs for full proof.