Please wrap lines so that the diff is more readable in the GitHub browser view.  (I've been told to do this too :-)