dirmngr: Minor cleanups.