Final changes towards rev. -16.
Fix long lines in the example.