[Libguestfs] [PATCH 2/2] Code cleanups related to RHBZ#580246.