elgamal: cleanups