C89 compliance
merge heads
Issue #17415: Clarify 'this' referent by moving containing sentence just after
the sentence referred to. Make other minor edits to improve flow.
Merge with 3.2
Merge with 3.3
Issue #17415: Trim trailing whitespace
Merge with 3.2
Merge with 3.3