Fix further trailing and inconsistent whitespace.