Clean up code formatting by use of `make reformat`

While a few places would benefit from excluding them from automatic formatting, we ease code reviews by expecting code to be formatted with `make reformat` prior to submitting.