bit more tweaking of null serialization