Cleanup following the previous commit.