Done. Also adding some for Null and Default value serialization since we configure those specifically.