Fix #228, small final reformat
Some files were still changed when doing a reformat of reformat. This fixes that, now there are no more reformat changes.
Some files were still changed when doing a reformat of reformat. This fixes that, now there are no more reformat changes.