Clean up whitespace to match the upstream project.