Merge pull request #12399 from lioncash/erasing General: Make use of std::erase_if/std::erase where applicable
