Reification: Fix wrapping of Lists and Sets with nulls in them