Normalize formatting to simplify merges between branches.