Most of the lines below are bad diff processing/whitespace changes.