Reformat some prototypes which actually fit on a single line.