More tweaking of attributes for serialization.