make dump_format output more homogenous