Merge "Fix field widths in dump, so as to make columns line up." into main