For the future, please avoid any whitespace changes. Send separate PRs for formatting if needed, but this makes going through history harder.