Breaking many lines.

It's not like I have religiously broken all lines at 80chars, and
I have to admit that at times I felt silly doing this.  But it
makes reading and writing the source on my laptop a little easier.
Merge from github after Jan's changes.
Small update for Prop 2.17.
Merge Jan's changes.