Dictate how to align function arguments

Also clean up trailing whitespace.

Also change all elided code to "...".