Formatting to 80 character limit.
Adding notees from @trevnorris for committers to follow.