Update usage text.

The -r was removed.
Return types and function names on different lines...

... so that it is more greppable.