dirmngr: More minor fixes.