Some more work on ElGamalSafe