Not every function header has its return type in a distinct line. This
patch corrects that.  This way there is more space for the arguments.