More whitespace cleanup after 565f4715317dc711d080add4afb6923dcb9b3b09