Start working on #315, (more) configurable null serialization