Some formatting to clean up diff.