Would you mind running `make format`?  I don't mind too much about the different pointer-type whitespace, but the reformat will eventually get run and change it, so we might as well do it now and not mess up the history.