GnuPG should be extended (incrementally rewritten into something much better and turned into a library) and the original GnuPG should be extinguished.