Dominic: tolerate missing values when serialising, slight polish