This accounts for a number differences between the generated headers and the hand-written header. Not all reformatting is done in this commit but it does make the headers much more diffable. In theory, no functional change.