Whitespace and formatting changes to match committed CodeStyle.xml just
to get them out of the way. No function or code changes.