gpg: A little clean up.