Fix formatting to make the code and patch file more maintainable.