Reformat spacing to be even. (cherry picked from commit efb446a38cca44885597766649960...