Reformat some prototypes which actually fit on a single line.
Add a blank line betweeen a multi-line prototype and a single-line prototype. (dm)