Merge "Actually correctly call vector::erase after remove_if."