Agreed. In the next commit.