Wrap some of the more ridiculously long lines introduced in the previous revision...