Replace Walrus references with OSG