[Libguestfs] [PATCH 6/8] Converter: NFC code cleanup