These style fixes seem to be completely unrelated to the rest of this PR. Why don't you submit them as a separate one?