The formatting was a bit off though (because I used add without whitespace changes, because the codebase still isn't trailing-whitespace clean). Fixed in the latest squash commit.