core: Minor cleanup in engine-gpg and -gpgsm.