General formatting fixup, part 1.