And removing some whitespace for the diff.