fixup! Fix serialization of empty sub-nvlists
fixup! Fix serialization of empty sub-nvlists