Got a bit carried away in my last commit.