More whitespace/line-break changes, fixed tests by using this where appropriate.