Update to formatting-data, reflecting Conchita's suggestions.