Automatic code formatting after all those FC 2.0 changes

A small fraction of the reformattings are not
as pretty as the original, but it's too much
effort to fix them up manually every time.