More minor cherry picked whitespace cleanup