Do a better job with indent and .5/.7 columns.

Also alpha-sort by table ID to make future diffs easier.
Store the whole table/column data so it can be sorted.