Tidy, and tests for the previous commit.