[Libguestfs] [PATCH 1/2] Updates to original patch, following feedback.