gpg: better valid.  Will be a fix for #499, when ported