agent,dirmngr: Tiny restructuring.