Shorten and correct some function-header comments.