Rollback spurious spacing changes from my IDE, refs #9856, #16286 !strict.