[libvirt] Second pass with cleanups suggested from Dan.