Fixed matrix_count being included (it's not used) in matrix data. Fixed list style matrix breaking on re-save.
Callout count isn't used anymore either.