Cleanup concerning the previous commit.