Adjust whitespace of things added in the past couple years to match the
original style of the file. No functional changes.