Mostly indentation fix here, but some col widths have changed.