Custom patches to get ProofGeneral to work for me...